Skip to content
Merged
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
6 changes: 2 additions & 4 deletions AdvCore_GridCompMod.F90
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ module AdvCore_GridCompMod

USE FV_StateMod, only: AdvCoreTracers => T_TRACERS
USE FV_StateMod, only: FV_Atm
use CubeGridPrototype, only: register_grid_and_regridders

implicit none
private
Expand Down Expand Up @@ -174,9 +173,8 @@ subroutine SetServices(gc, rc)
call fms_init(comm)

if (.NOT. FV3_DynCoreIsRunning) then
! Make sure FV3 is setup
call register_grid_and_regridders()
call fv_init1(FV_Atm, dt, grids_on_my_pe, p_split)
! Make sure FV3 is setup
call fv_init1(FV_Atm, dt, grids_on_my_pe, p_split)
! Get Domain decomposition
call MAPL_GetResource(MAPL, nx, 'NX:', default=0, _RC)
FV_Atm(1)%layout(1) = nx
Expand Down
27 changes: 5 additions & 22 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,10 @@ set (srcs
Cube2LatLon.F90 LatLon2Cube.F90 AppGridCreate.F90 FV_StateMod.F90
AdvCore_GridCompMod.F90
DynCore_GridCompMod.F90 CreateInterpWeights_GridCompMod.F90
CubeToLatLonRegridder.F90
LatLonToCubeRegridder.F90
CubeToCubeRegridder.F90
CubeToLatLon.F90
CubeGridPrototype.F90
GEOS_FV3_Utilities.F90
fv_regrid_c2c.F90
fv_regrid_c2c_bin.F90
fv_regridding_utils.F90
fv_regrid_c2c.F90
rs_scaleMod.F90
)
if (BUILD_GEOS_GTFV3_INTERFACE)
Expand Down Expand Up @@ -165,29 +160,17 @@ ecbuild_add_executable (
LIBS ${this} OpenMP::OpenMP_Fortran)

ecbuild_add_executable (
TARGET c2c.x
SOURCES c2c.F90
LIBS ${this} OpenMP::OpenMP_Fortran)

ecbuild_add_executable (
TARGET interp_restarts.x
SOURCES interp_restarts.F90
LIBS ${this} OpenMP::OpenMP_Fortran)

ecbuild_add_executable (
TARGET interp_restarts_bin.x
SOURCES interp_restarts_bin.F90
LIBS ${this} OpenMP::OpenMP_Fortran)
TARGET interp_restarts.x
SOURCES interp_restarts.F90
LIBS ${this} OpenMP::OpenMP_Fortran)

# If we are doing R4R8 we also need add_dependencies for both fms_r4 and fms_r8
# for all our executables that link to ${this} because of the way we set up the
# main library above.
if (FV_PRECISION STREQUAL R4R8)
foreach(executable
rs_scale.x
c2c.x
interp_restarts.x
interp_restarts_bin.x)
interp_restarts.x)

# fvdycore needs r4 .mod interfaces
get_target_property(inc_r4 FMS::fms_r4 INTERFACE_INCLUDE_DIRECTORIES)
Expand Down
27 changes: 0 additions & 27 deletions CubeGridPrototype.F90

This file was deleted.

250 changes: 0 additions & 250 deletions CubeToCubeRegridder.F90

This file was deleted.

Loading
Loading