Skip to content

Commit

Permalink
Merge pull request EESSI#166 from TopRichard/nessi.no-2023.06-WRF/4.3…
Browse files Browse the repository at this point in the history
…-dmpar-foss/2021a

{2023.06}[foss/2021a] WRF-dmpar V4.3
  • Loading branch information
TopRichard authored Oct 3, 2023
2 parents 6e885b8 + 7380866 commit a2c10d0
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
10 changes: 7 additions & 3 deletions eb_hooks.py
Original file line number Diff line number Diff line change
Expand Up @@ -238,12 +238,16 @@ def pre_configure_hook_wrf_aarch64(self, *args, **kwargs):
if get_cpu_architecture() == AARCH64:
pattern = "Linux x86_64 ppc64le, gfortran"
repl = "Linux x86_64 aarch64 ppc64le, gfortran"
self.cfg.update('preconfigopts', "sed -i 's/%s/%s/g' arch/configure_new.defaults && " % (pattern, repl))
print_msg("Using custom preconfigopts for %s: %s", self.name, self.cfg['preconfigopts'])
if LooseVersion(self.version) <= LooseVersion('3.9.0'):
self.cfg.update('preconfigopts', "sed -i 's/%s/%s/g' arch/configure_new.defaults && " % (pattern, repl))
print_msg("Using custom preconfigopts for %s: %s", self.name, self.cfg['preconfigopts'])

if LooseVersion('4.0.0') <= LooseVersion(self.version) <= LooseVersion('4.2.1'):
self.cfg.update('preconfigopts', "sed -i 's/%s/%s/g' arch/configure.defaults && " % (pattern, repl))
print_msg("Using custom preconfigopts for %s: %s", self.name, self.cfg['preconfigopts'])
else:
raise EasyBuildError("WRF-specific hook triggered for non-WRF easyconfig?!")


PARSE_HOOKS = {
'CGAL': parse_hook_cgal_toolchainopts_precise,
'fontconfig': parse_hook_fontconfig_add_fonts,
Expand Down
1 change: 1 addition & 0 deletions eessi-2023.06-eb-4.7.2-2021a.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,4 @@ easyconfigs:
- BAGEL-1.2.2-foss-2021a.eb:
options:
from-pr: 18446
- WRF-4.3-foss-2021a-dmpar.eb

0 comments on commit a2c10d0

Please sign in to comment.