Skip to content

Commit

Permalink
working compile with type changes
Browse files Browse the repository at this point in the history
  • Loading branch information
rem1776 authored and rem1776 committed Aug 4, 2023
1 parent 19ee83f commit 1a309f4
Show file tree
Hide file tree
Showing 9 changed files with 343 additions and 4,980 deletions.
5 changes: 4 additions & 1 deletion coupler/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,10 @@ noinst_LTLIBRARIES = libcoupler.la
libcoupler_la_SOURCES = \
coupler_types.F90 \
ensemble_manager.F90 \
atmos_ocean_fluxes.F90
atmos_ocean_fluxes.F90 \
include/coupler_types.inc \
include/coupler_types_r4.fh \
include/coupler_types_r8.fh

# Some mods are dependant on other mods in this dir.
atmos_ocean_fluxes_mod.$(FC_MODEXT): coupler_types_mod.$(FC_MODEXT)
Expand Down
1 change: 1 addition & 0 deletions coupler/atmos_ocean_fluxes.F90
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ module atmos_ocean_fluxes_mod
use fm_util_mod, only: fm_util_check_for_bad_fields, fm_util_get_string
use fm_util_mod, only: fm_util_get_real_array, fm_util_get_real, fm_util_get_integer
use fm_util_mod, only: fm_util_get_logical, fm_util_get_logical_array
use platform_mod, only: r4_kind, r8_kind

implicit none
private
Expand Down
640 changes: 182 additions & 458 deletions coupler/coupler_types.F90

Large diffs are not rendered by default.

1,174 changes: 0 additions & 1,174 deletions coupler/include/atmos_ocean_fluxes.inc

This file was deleted.

2,962 changes: 44 additions & 2,918 deletions coupler/include/coupler_types.inc

Large diffs are not rendered by default.

50 changes: 50 additions & 0 deletions coupler/include/coupler_types_r4.fh
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
!***********************************************************************
!* 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/>.
!***********************************************************************

#undef FMS_CP_KIND_
#define FMS_CP_KIND_ r4_kind

#undef CT_RESCALE_DATA_2D_
#define CT_RESCALE_DATA_2D_ CT_rescale_data_2d_r4

#undef CT_RESCALE_DATA_3D_
#define CT_RESCALE_DATA_3D_ CT_rescale_data_3d_r4

#undef CT_INCREMENT_DATA_2D_3D_
#define CT_INCREMENT_DATA_2D_3D_ CT_increment_data_2d_3d_r4

#undef CT_EXTRACT_DATA_2D_
#define CT_EXTRACT_DATA_2D_ CT_extract_data_2d_r4

#undef CT_EXTRACT_DATA_3D_
#define CT_EXTRACT_DATA_3D_ CT_extract_data_3d_r4

#undef CT_EXTRACT_DATA_3D_2D_
#define CT_EXTRACT_DATA_3D_2D_ CT_extract_data_3d_2d_r4

#undef CT_SET_DATA_2D_
#define CT_SET_DATA_2D_ CT_set_data_2d_r4

#undef CT_SET_DATA_2D_3D_
#define CT_SET_DATA_2D_3D_ CT_set_data_2d_3d_r4

#undef CT_SET_DATA_3D_
#define CT_SET_DATA_3D_ CT_set_data_3d_r4

#include "include/coupler_types.inc"
50 changes: 50 additions & 0 deletions coupler/include/coupler_types_r8.fh
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
!***********************************************************************
!* 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/>.
!***********************************************************************

#undef FMS_CP_KIND_
#define FMS_CP_KIND_ r8_kind

#undef CT_RESCALE_DATA_2D_
#define CT_RESCALE_DATA_2D_ CT_rescale_data_2d_r8

#undef CT_RESCALE_DATA_3D_
#define CT_RESCALE_DATA_3D_ CT_rescale_data_3d_r8

#undef CT_INCREMENT_DATA_2D_3D_
#define CT_INCREMENT_DATA_2D_3D_ CT_increment_data_2d_3d_r8

#undef CT_EXTRACT_DATA_2D_
#define CT_EXTRACT_DATA_2D_ CT_extract_data_2d_r8

#undef CT_EXTRACT_DATA_3D_
#define CT_EXTRACT_DATA_3D_ CT_extract_data_3d_r8

#undef CT_EXTRACT_DATA_3D_2D_
#define CT_EXTRACT_DATA_3D_2D_ CT_extract_data_3d_2d_r8

#undef CT_SET_DATA_2D_
#define CT_SET_DATA_2D_ CT_set_data_2d_r8

#undef CT_SET_DATA_2D_3D_
#define CT_SET_DATA_2D_3D_ CT_set_data_2d_3d_r8

#undef CT_SET_DATA_3D_
#define CT_SET_DATA_3D_ CT_set_data_3d_r8

#include "include/coupler_types.inc"
Loading

0 comments on commit 1a309f4

Please sign in to comment.