Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

part of cam6_4_011: fix the path to fms for fv3 build, remove mct reference #1067

Merged
merged 1 commit into from
Jul 19, 2024
Merged

part of cam6_4_011: fix the path to fms for fv3 build, remove mct reference #1067

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 0 additions & 9 deletions cime_config/buildcpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,15 +73,6 @@ def buildcpp(case):
case.set_value("EPS_AAREA", "1.0e-04")
case.set_value("EPS_AGRID", "1.0e-05")

# The vector mapping (in the mediator) needs to be 'cart3d' for SE
# NB: This is currently the default, is it working by conincidence for
# other unstructured dycores?
# For cmeps/nuopc cart3d is always the default option for all grids
match = re.match(r'ne[0-9]', atm_grid)
if match:
if (comp_interface == 'mct'):
case.set_value('VECT_MAP', 'cart3d')

# if need to build - then construct configure command
config_opts = ["-s", "-fc_type", compiler, "-dyn", cam_dycore,
"-hgrid", atm_grid, "-cpl", comp_interface,
Expand Down
4 changes: 2 additions & 2 deletions cime_config/buildlib
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ def _build_fms(caseroot, libroot, bldroot):

mpilib = case.get_value("MPILIB")
sharedpath = os.path.join(case.get_value("COMPILER"), mpilib,
strdebug, strthread, "nuopc")
strdebug, strthread)
slr = os.path.abspath(case.get_value("SHAREDLIBROOT"))
fmsbuildroot = os.path.join(slr, sharedpath)
fmsinstallpath = os.path.join(fmsbuildroot, "FMS")
Expand Down Expand Up @@ -108,7 +108,7 @@ def _build_cam(caseroot, libroot, bldroot):
threaded = "threads" if case.get_value("BUILD_THREADED") or case.get_value("FORCE_BUILD_SMP") else "nothreads"
comp_interface = case.get_value("COMP_INTERFACE")
fmsbuilddir = os.path.join(
slr, compiler, mpilib, debug, threaded, comp_interface, "FMS")
slr, compiler, mpilib, debug, threaded, "FMS")
user_incldir = '"-I{} -I{} -I{}"'.format(
os.path.join(srcroot, "libraries", "FMS", "src", "include"),
os.path.join(srcroot, "libraries", "FMS", "src", "mpp", "include"),
Expand Down