mixed precision mosaic2

CMakeLists.txt

@@ -201,7 +201,7 @@ list(APPEND fms_c_src_files
   mosaic/gradient_c2l.c
   mosaic/interp.c
   mosaic/mosaic_util.c
-  mosaic/read_mosaic.c
+  mosaic/get_global_area.c
   mpp/mpp_memuse.c
   parser/yaml_parser_binding.c
   parser/yaml_output_functions.c
@@ -314,6 +314,7 @@ foreach(kind ${kinds})
                                                  constants4
                                                  topography/include
                                                  axis_utils/include
+                                                 mosaic2/include
                                                  constants
                                                  astronomy/include
                                                  field_manager/include
@@ -363,6 +364,7 @@ foreach(kind ${kinds})
     $<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>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/mosaic2/include>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/string_utils/include>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/mpp/include>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/topography/include>
@@ -372,6 +374,7 @@ foreach(kind ${kinds})
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/tracer_manager/include>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/interpolator/include>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/coupler/include>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/mosaic2/include>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/data_override/include>)
 
 

mosaic/Makefile.am

@@ -38,22 +38,22 @@ create_xgrid.c \
 gradient_c2l.c \
 interp.c \
 mosaic_util.c \
-read_mosaic.c \
+get_global_area.c \
 constant.h \
 create_xgrid.h \
 gradient_c2l.h \
 interp.h \
 mosaic_util.h \
-read_mosaic.h
+get_global_area.h
 
 # Some mods are dependant on other mods in this dir.
 grid_mod.$(FC_MODEXT): mosaic_mod.$(FC_MODEXT)
 
 # Mod files are built and then installed as headers.
 MODFILES = \
-  mosaic_mod.$(FC_MODEXT) \
-  grid_mod.$(FC_MODEXT) \
-  gradient_mod.$(FC_MODEXT)
+	mosaic_mod.$(FC_MODEXT) \
+	grid_mod.$(FC_MODEXT) \
+	gradient_mod.$(FC_MODEXT)
 nodist_include_HEADERS = $(MODFILES)
 BUILT_SOURCES = $(MODFILES)
 

mosaic/get_global_area.c

@@ -0,0 +1,43 @@
+/***********************************************************************
+ *                   GNU Lesser General Public License
+ *
+ * This file is part of the GFDL Flexible Modeling System (FMS).
+ *
+ * FMS is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * FMS is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FMS.  If not, see <http://www.gnu.org/licenses/>.
+ **********************************************************************/
+#include <stdlib.h>
+#include <stdio.h>
+#include <math.h>
+#include <string.h>
+#include "get_global_area.h"
+#include "constant.h"
+
+/** \file
+ *  \ingroup mosaic
+ *  \brief Compute global area
+ */
+
+double get_global_area(void)
+{
+  double garea;
+  garea = 4*M_PI*RADIUS*RADIUS;
+  return garea;
+}
+
+double get_global_area_(void)
+{
+  double garea;
+  garea = 4*M_PI*RADIUS*RADIUS;
+  return garea;
+}

mosaic/get_global_area.h

@@ -0,0 +1,27 @@
+/***********************************************************************
+ *                   GNU Lesser General Public License
+ *
+ * This file is part of the GFDL Flexible Modeling System (FMS).
+ *
+ * FMS is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * FMS is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FMS.  If not, see <http://www.gnu.org/licenses/>.
+ **********************************************************************/
+#ifndef GET_GLOBAL_AREA_
+#define GET_GLOBAL_AREA_
+
+/* get global area */
+
+double get_global_area(void);
+double get_global_area_(void);
+
+#endif

mosaic/mosaic_util.c

@@ -504,7 +504,6 @@ double great_circle_area(int n, const double *x, const double *y, const double *
 
     /* compute angle for pnt1 */
     sum += spherical_angle(pnt1, pnt2, pnt0);
-
   }
   area = (sum - (n-2.)*M_PI) * RADIUS* RADIUS;
   return area;