From 62aaaef1cc4ce4f7958effe14fe162dc4a530b04 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Thu, 10 Jun 2021 12:47:47 -0600 Subject: [PATCH 1/2] Use same compiler flags GSDCHEM routines and the GOCART process library when FV3 is build in single or double precision --- .gitmodules | 6 ++++-- gocart-interface/CMakeLists.txt | 34 +-------------------------------- gocart-interface/gocart | 2 +- 3 files changed, 6 insertions(+), 36 deletions(-) diff --git a/.gitmodules b/.gitmodules index 2d76a23c98..625b537560 100644 --- a/.gitmodules +++ b/.gitmodules @@ -20,8 +20,10 @@ branch = gsl/develop [submodule "gocart"] path = gocart-interface/gocart - url = https://github.com/NOAA-GSL/GOCART - branch = gsl/develop-chem + #url = https://github.com/NOAA-GSL/GOCART + #branch = gsl/develop-chem + url = https://github.com/climbfuji/GOCART + branch = dont_use_realstarteight [submodule "CMakeModules"] path = CMakeModules url = https://github.com/NOAA-EMC/CMakeModules diff --git a/gocart-interface/CMakeLists.txt b/gocart-interface/CMakeLists.txt index 161f9e3492..e5930f919a 100644 --- a/gocart-interface/CMakeLists.txt +++ b/gocart-interface/CMakeLists.txt @@ -50,39 +50,7 @@ if(32BIT) elseif(CMAKE_Fortran_COMPILER_ID MATCHES "GNU") set(CMAKE_Fortran_FLAGS_64bit "${CMAKE_Fortran_FLAGS_64bit} -fdefault-real-8") endif() - SET_SOURCE_FILES_PROPERTIES(gocart/Process_Library/aero_soa_vbs_data_mod.F90 - gocart/Process_Library/dep_dry_gocart_mod.F90 - gocart/Process_Library/dep_dry_mod.F90 - gocart/Process_Library/dep_simple_mod.F90 - gocart/Process_Library/dep_vertmx_mod.F90 - gocart/Process_Library/dep_wet_ls_mod.F90 - gocart/Process_Library/dust_afwa_mod.F90 - gocart/Process_Library/dust_data_mod.F90 - gocart/Process_Library/dust_fengsha_mod.F90 - gocart/Process_Library/dust_gocart_mod.F90 - gocart/Process_Library/gocart_aerosols_mod.F90 - gocart/Process_Library/gocart_chem_mod.F90 - gocart/Process_Library/gocart_diag_mod.F90 - gocart/Process_Library/gocart_dmsemis_mod.F90 - gocart/Process_Library/gocart_settling_mod.F90 - gocart/Process_Library/gsd_chem_config.F90 - gocart/Process_Library/gsd_chem_constants.F90 - gocart/Process_Library/opt_aer_mod.F90 - gocart/Process_Library/opt_aer_out_mod.F90 - gocart/Process_Library/opt_aer_ra_mod.F90 - gocart/Process_Library/opt_averaging_mod.F90 - gocart/Process_Library/opt_data_mod.F90 - gocart/Process_Library/opt_driver_mod.F90 - gocart/Process_Library/opt_gocart_mod.F90 - gocart/Process_Library/opt_mod.F90 - gocart/Process_Library/plume_data_mod.F90 - gocart/Process_Library/plume_rise_mod.F90 - gocart/Process_Library/plume_scalar_mod.F90 - gocart/Process_Library/plume_zero_mod.F90 - gocart/Process_Library/seas_data_mod.F90 - gocart/Process_Library/seas_mod.F90 - gocart/Process_Library/seas_ngac_mod.F90 - gocart/Process_Library/vash_settling_mod.F90 + SET_SOURCE_FILES_PROPERTIES(${_gocart_srcs} PROPERTIES COMPILE_FLAGS "${CMAKE_Fortran_FLAGS_64bit}") endif() diff --git a/gocart-interface/gocart b/gocart-interface/gocart index c35e9f53e6..a9fe4359f8 160000 --- a/gocart-interface/gocart +++ b/gocart-interface/gocart @@ -1 +1 @@ -Subproject commit c35e9f53e6e9cc2988080f6280f9c2f543012eb7 +Subproject commit a9fe4359f8014a6e6d7aa82a6beab2ea7fc7391a From 8abd7ae49b32995742492f7c4595ed125873b9b8 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Wed, 23 Jun 2021 09:28:21 -0600 Subject: [PATCH 2/2] Revert change to .gitmodules and update submodule pointer for gocart-interface/gocart --- .gitmodules | 6 ++---- gocart-interface/gocart | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index c83375bff5..98634a69a5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -20,10 +20,8 @@ branch = gsl/develop-chem [submodule "gocart"] path = gocart-interface/gocart - #url = https://github.com/NOAA-GSL/GOCART - #branch = gsl/develop-chem - url = https://github.com/climbfuji/GOCART - branch = dont_use_realstarteight + url = https://github.com/NOAA-GSL/GOCART + branch = gsl/develop-chem [submodule "CMakeModules"] path = CMakeModules url = https://github.com/NOAA-EMC/CMakeModules diff --git a/gocart-interface/gocart b/gocart-interface/gocart index a9fe4359f8..054de983d4 160000 --- a/gocart-interface/gocart +++ b/gocart-interface/gocart @@ -1 +1 @@ -Subproject commit a9fe4359f8014a6e6d7aa82a6beab2ea7fc7391a +Subproject commit 054de983d4d118ce3b83198cf181a3f6b603d0aa