Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cleanup mosaic/read_mosaic.c #1345

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions mosaic/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
57 changes: 57 additions & 0 deletions mosaic/get_global_area.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
/***********************************************************************
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I used git mv to move read_mosaic.c to get_global_area.c so that Github knows which files to compare, but seems like it's not working here.

* 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
*/

#ifdef OVERLOAD_R4
float get_global_area(void)
{
float garea;
#else
double get_global_area(void)
{
double garea;
#endif
garea = 4*M_PI*RADIUS*RADIUS;

return garea;
}

#ifdef OVERLOAD_R4
float get_global_area_(void)
{
float garea;
#else
double get_global_area_(void)
{
double garea;
#endif
garea = 4*M_PI*RADIUS*RADIUS;

return garea;
}
45 changes: 45 additions & 0 deletions mosaic/get_global_area.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
/***********************************************************************
* 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 */


#ifdef OVERLOAD_R4

float get_global_area(void);

#else

double get_global_area(void);

#endif

#ifdef OVERLOAD_R4

float get_global_area_(void);

#else

double get_global_area_(void);

#endif /* OVERLOAD_R4 */

#endif
Loading
Loading