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_3_086: update python paths, only build ali_arms with waccm #706

Merged
merged 1 commit into from
Dec 9, 2022
Merged

part of cam6_3_086: update python paths, only build ali_arms with waccm #706

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: 4 additions & 5 deletions bld/configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1660,7 +1660,7 @@ elsif ($fc =~ /nvfor/) { $fc_type = 'nvhpc'; }

# User override for Fortran compiler type
if (defined $opts{'fc_type'}) { $fc_type = $opts{'fc_type'}; }

if ($fc_type == "oneapi") {$fc_type = 'intel'; }
if ($fc_type) {
$cfg_ref->set('fc_type', $fc_type);
if ($print>=2) { print "Fortran compiler type: $fc_type$eol"; }
Expand Down Expand Up @@ -2150,6 +2150,9 @@ sub write_filepath
}
if ($waccm_phys) {
print $fh "$camsrcdir/src/physics/waccm\n";
print $fh "$camsrcdir/src/physics/ali_arms\n";
print $fh "$camsrcdir/src/physics/ali_arms/subs\n";
print $fh "$camsrcdir/src/physics/ali_arms/include\n";
}
print $fh "$camsrcdir/src/ionosphere\n";

Expand Down Expand Up @@ -2178,10 +2181,6 @@ sub write_filepath
print $fh "$camsrcdir/src/physics/pumas-frozen\n";
}

print $fh "$camsrcdir/src/physics/ali_arms\n";
print $fh "$camsrcdir/src/physics/ali_arms/subs\n";
print $fh "$camsrcdir/src/physics/ali_arms/include\n";

# Superparameterization
if ($phys_pkg eq 'spcam_m2005' or $phys_pkg eq 'spcam_sam1mom') {
print $fh "$camsrcdir/src/physics/spcam\n";
Expand Down
2 changes: 1 addition & 1 deletion cime_config/buildcpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import os, sys, re
CIMEROOT = os.environ.get("CIMEROOT")
if CIMEROOT is None:
raise SystemExit("ERROR: must set CIMEROOT environment variable")
sys.path.append(os.path.join(CIMEROOT, "scripts", "Tools"))
sys.path.append(os.path.join(CIMEROOT, "CIME", "Tools"))

from standard_script_setup import *

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 @@ -12,7 +12,7 @@ _CIMEROOT = os.environ.get("CIMEROOT")
if _CIMEROOT is None:
raise SystemExit("ERROR: must set CIMEROOT environment variable")

_LIBDIR = os.path.join(_CIMEROOT, "scripts", "Tools")
_LIBDIR = os.path.join(_CIMEROOT, "CIME", "Tools")
sys.path.append(_LIBDIR)

from standard_script_setup import *
Expand Down Expand Up @@ -99,7 +99,7 @@ def _build_cam(caseroot, libroot, bldroot):
complib = os.path.join(libroot, "libatm.a")
makefile = os.path.join(casetools, "Makefile")

cmd = "{} complib -j {} MODEL=cam COMPLIB={} -f {} {} " \
cmd = "{} complib -j {} COMP_NAME=cam COMPLIB={} -f {} {} " \
.format(gmake, gmake_j, complib, makefile, get_standard_makefile_args(case))
if cam_cppdefs:
cmd += " USER_CPPDEFS='{}'".format(cam_cppdefs)
Expand Down