Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/mixedmode' into mixedmode-interp
Browse files Browse the repository at this point in the history
  • Loading branch information
mlee03 authored and mlee03 committed Jul 31, 2023
2 parents e858037 + f7b7544 commit 3685de7
Show file tree
Hide file tree
Showing 61 changed files with 3,254 additions and 16,478 deletions.
15 changes: 13 additions & 2 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -304,12 +304,17 @@ foreach(kind ${kinds})
fms2_io/include
string_utils/include
mpp/include
monin_obukhov/include
sat_vapor_pres/include
horiz_interp/include
random_numbers/include
diag_manager/include
constants4
constants
axis_utils/include)
axis_utils/include
field_manager/include
tracer_manager/include)

target_compile_definitions(${libTgt}_f PRIVATE "${fms_defs}")
target_compile_definitions(${libTgt}_f PRIVATE "${${kind}_defs}")

Expand Down Expand Up @@ -345,11 +350,17 @@ 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}/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>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/string_utils/include>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/mpp/include>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/diag_manager/include>)
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/random_numbers/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}/tracer_manager/include>)


target_include_directories(${libTgt} INTERFACE
$<BUILD_INTERFACE:${moduleDir}>
Expand Down
12 changes: 12 additions & 0 deletions axis_utils/include/axis_utils2.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,7 @@
!! 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.,
!!
Expand All @@ -179,12 +180,23 @@
!!
!! 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)
Expand Down
7 changes: 3 additions & 4 deletions block_control/block_control.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -198,10 +198,9 @@ subroutine define_blocks_packed (component, Block, isc, iec, jsc, jec, &
nblks = 1
blksz = tot_pts
else
if (mod(tot_pts,blksz) .eq. 0) then
nblks = tot_pts/blksz
else
nblks = ceiling(real(tot_pts)/real(blksz))
nblks = tot_pts/blksz
if (mod(tot_pts,blksz) .gt. 0) then
nblks = nblks + 1
endif
endif

Expand Down
260 changes: 0 additions & 260 deletions block_control/include/block_control.inc
View file

This file was deleted.

2 changes: 2 additions & 0 deletions configure.ac
View file
Original file line number Diff line number Diff line change
Expand Up @@ -496,6 +496,8 @@ AC_CONFIG_FILES([
test_fms/parser/Makefile
test_fms/string_utils/Makefile
test_fms/sat_vapor_pres/Makefile
test_fms/tracer_manager/Makefile
test_fms/random_numbers/Makefile
FMS.pc
])

Expand Down
14 changes: 11 additions & 3 deletions coupler/coupler_types.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ module coupler_types_mod
use data_override_mod, only: data_override
use mpp_domains_mod, only: domain2D, mpp_redistribute
use mpp_mod, only: mpp_error, FATAL, mpp_chksum
use platform_mod, only: r4_kind, r8_kind

use iso_fortran_env, only : int32, int64 !To get mpp_chksum value

Expand Down Expand Up @@ -199,16 +200,23 @@ module coupler_types_mod
type(coupler_1d_values_type), pointer, dimension(:) :: field => NULL() !< field
character(len=128) :: flux_type = ' ' !< flux_type
character(len=128) :: implementation = ' ' !< implementation
real, pointer, dimension(:) :: param => NULL() !< param
!> precision has been explicitly defined
!! to be r8_kind during mixedmode update to field_manager
!! this explicit definition can be removed during the coupler update and be made into FMS_CP_KIND_
real(r8_kind), pointer, dimension(:) :: param => NULL() !< param
logical, pointer, dimension(:) :: flag => NULL() !< flag
integer :: atm_tr_index = 0 !< atm_tr_index
character(len=128) :: ice_restart_file = ' ' !< ice_restart_file
character(len=128) :: ocean_restart_file = ' ' !< ocean_restart_file
logical :: use_atm_pressure !< use_atm_pressure
logical :: use_10m_wind_speed !< use_10m_wind_speed
logical :: pass_through_ice !< pass_through_ice
real :: mol_wt = 0.0 !< mol_wt
end type coupler_1d_field_type
!> precision has been explicitly defined
!! to be r8_kind during mixedmode update to field_manager
!! this explicit definition can be removed during the coupler update and be made into FMS_CP_KIND_
real(r8_kind) :: mol_wt = 0.0 !< mol_wt

end type coupler_1d_field_type

!> Coupler data for 1D boundary conditions
!> @ingroup coupler_types_mod
Expand Down
Loading

0 comments on commit 3685de7

Please sign in to comment.