From b7d9afd21c3faae15a42dc482a0164a7db7aa04e Mon Sep 17 00:00:00 2001 From: Tom Clune Date: Fri, 30 Aug 2019 08:13:33 -0400 Subject: [PATCH 1/2] Imported changes from original repo in GEOSgcm_GridComp. --- model/fv_tracer2d.F90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/model/fv_tracer2d.F90 b/model/fv_tracer2d.F90 index 5e425b374..85f8c8b83 100644 --- a/model/fv_tracer2d.F90 +++ b/model/fv_tracer2d.F90 @@ -543,7 +543,7 @@ subroutine tracer_2d(q, dp1, mfx, mfy, cx, cy, gridstruct, bd, domain, npx, npy, enddo enddo - if ( it /= nsplt ) then + if ( it /= ksplt(k) ) then do j=js,je do i=is,ie dp1(i,j,k) = dp2(i,j) From ecebd85eebb92b0e7377d509b360565ac8bebd47 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Tue, 1 Oct 2019 13:26:15 -0400 Subject: [PATCH 2/2] Fixes #1. Rename GFDL_fms to fms --- CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a18291938..9e956bfbc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -50,7 +50,7 @@ set (srcs if (FV_PRECISION STREQUAL R4) elseif (FV_PRECISION STREQUAL R4R8) # FV is R4 but FMS is R8 - get_target_property (extra_incs GFDL_fms_r4 INCLUDE_DIRECTORIES) + get_target_property (extra_incs fms_r4 INCLUDE_DIRECTORIES) elseif (FV_PRECISION STREQUAL R8) endif () @@ -61,12 +61,12 @@ esma_add_library (${this} if (FV_PRECISION STREQUAL R4) target_compile_definitions (${this} PRIVATE -DSINGLE_FV -DOVERLOAD_R4) - target_link_libraries (${this} PUBLIC GFDL_fms_r4) + target_link_libraries (${this} PUBLIC fms_r4) elseif (FV_PRECISION STREQUAL R4R8) # FV is R4 but FMS is R8 target_compile_definitions (${this} PRIVATE -DSINGLE_FV -DOVERLOAD_R4) - target_link_libraries (${this} PUBLIC GFDL_fms_r8) + target_link_libraries (${this} PUBLIC fms_r8) elseif (FV_PRECISION STREQUAL R8) - target_link_libraries (${this} PUBLIC GFDL_fms_r8) + target_link_libraries (${this} PUBLIC fms_r8) string(REPLACE " " ";" tmp ${FREAL8}) foreach(flag ${tmp}) target_compile_options (${this} PRIVATE $<$:${flag}>)