Skip to content

Commit 6fb5e9c

Browse files
mathomp4atrayanotclunepchakrabortyCopilot
authored
Merge release/MAPL-v3 into develop (#4902)
Co-authored-by: Atanas Trayanov <Atanas.L.Trayanov@nasa.gov> Co-authored-by: Tom Clune <thomas.l.clune@nasa.gov> Co-authored-by: Atanas Trayanov <atanas.trayanov@gmail.com> Co-authored-by: Matt Thompson <matthew.thompson@nasa.gov> Co-authored-by: pchakraborty <pchakraborty@users.noreply.github.com> Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: tclune <6225888+tclune@users.noreply.github.com> Co-authored-by: Weiyuan Jiang <52509753+weiyuan-jiang@users.noreply.github.com> Co-authored-by: Darian Boggs <61847056+darianboggs@users.noreply.github.com> Co-authored-by: Weiyuan Jiang <wjiang@gs6101-bucy.gsfc.nasa.gov> Co-authored-by: Matthew Thompson <matthew.thompson@nasa.gov> Co-authored-by: Benjamin Auer <benjamin.m.auer@nasa.gov> Co-authored-by: Purnendu Chakraborty <purnendu.chakraborty@nasa.gov> Co-authored-by: Darian Boggs <william.d.boggs@nasa.gov> Co-authored-by: Atanas L. Trayanov <atrayano@gs6101-bucy.gsfc.nasa.gov> Fixes #4455 Fixes #4482 Fixes #4481 Closes #4497 (Task 2.8) Fixes #4497 Fixes #4506 Fixes #4522 Fixes #4527 Resolves #4528 Resolves #4529 fixes the build failure in PR #4538. Fix generic3g layer normalization to use vertical stagger and condensed arrays (#4543) (#4544) Resolves #4531 Resolves #4531 Task 7 fixes #4566 Fixes #4573 fix CI-breaking _ASSERT (#4440) Fix gfortran preprocessor error: no multi-line _ASSERT args (#4440) fix _FAILURE macro (#4586) Closes #4600 Fix ifx #6451: rename use_field_dictionary dummy arg to use_fd Fix ifx #6451: rename use_field_dictionary dummy arg to use_fd" Resolve handmerge conflicts for #4610 into release/MAPL-v3 Fixes #4625 Fix precision changes in constants per Gemini (#4635) Fix modules that inadvertently re-export StringVector (#4639) fixes #4598 (#4632) fixes #4598 Fixes #4563 fix(FieldBLAS): propagate MAPL_UNDEF through field arithmetic (#4651) fix(test): avoid grid-resonance in masked vector regrid test (#4653) Fixes #4652. fix(DynamicMask): remove cross-precision mask value casts (#4663) Fixes #4654 fix(regridder): reference issue #4672 in dateline: DC workaround comment fixes #4661) Closes #4678 Fix RegridTransform typekind for cross-geom connections (#4694) (#4702) Fix RegridTransform typekind for cross-geom connections (#4694) Closes #4706 Closes #4708 Fix NAG OpenMP per-DSO lazy initialization crash in profiler (#4715) Closes #4700 Fixes for Spack, NAG, and Python 3.11 (#4671) Fix vertical regrid (#4675) fixes #4721 (#4722) Closes #4725 Closes #4724 Closes #4730 (partially — OpenMP part only; MAPL_GenericMod remains) Fixes #4743 (#4744) fix on locally-defined names in Comms.F90; MAPL_root -> MAPL_ROOT (#4747) Fix public MAPL_ROOT export and replace rc=status/_VERIFY with _RC in include/*.H (#4747) Fix CI failures: uppercase MPI names in only: list, replace nint with int in save initializer (#4747) Closes #4752. Closes #4762 (partial - MAPL_Resource deferred). Closes #4755. Fixes for MAPL3 docs (#4768) fix for capitalization issue. (#4774) fix Aerosol_Cap.F90 MAPL_Finalize call (#4780) Closes #4776. Fixes #4792 (#4793) Resolves #4788 Fix blatant bug in ExtData3G (#4804) Fixes #4805. Closes #4811. Closes #4811 Closes #4825 Closes #4809. Part of #4828. Closes #4844. Last call site was removed in GEOS-ESM/GEOSgcm_GridComp#1405. Closes #4846. Closes #4849 fixes #4875) closes #4874) (#4883) closes #4874) fix stale tests (refs #4884) (#4885) fix valid_range/source_time parsing in ExtData3G (refs #4884) Fix Test_HConfigAs: split semicolon-separated @assertEqual onto separate lines (refs #4884) fix for crash in case of absent optional dummy (#4887) Closes #4554
1 parent d3a1b9e commit 6fb5e9c

2,380 files changed

Lines changed: 148405 additions & 157495 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.circleci/config.yml‎

Lines changed: 117 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -24,65 +24,56 @@ orbs:
2424
ci: geos-esm/circleci-tools@4
2525

2626
workflows:
27-
build-and-test-MAPL:
28-
jobs:
29-
# Builds MAPL in a "default" way
30-
- ci/build:
31-
name: build-and-test-MAPL-as-<< matrix.build_type >>-on-<< matrix.compiler >>-using-<< matrix.cmake_generator >>
32-
context:
33-
- docker-hub-creds
34-
matrix:
35-
parameters:
36-
compiler: [ifort]
37-
cmake_generator: ['Unix Makefiles']
38-
build_type: ['Debug']
39-
baselibs_version: *baselibs_version
40-
repo: MAPL
41-
mepodevelop: false
42-
run_unit_tests: true
43-
ctest_options: "-L 'ESSENTIAL' --output-on-failure"
44-
persist_workspace: true # Needed for MAPL tutorials
45-
46-
# Run MAPL Tutorials
47-
- ci/run_mapl_tutorial:
48-
name: run-<< matrix.tutorial_name >>-Tutorial-with-<< matrix.compiler >>-built-with-<< matrix.build_type >>
49-
context:
50-
- docker-hub-creds
51-
matrix:
52-
parameters:
53-
compiler: [ifort]
54-
build_type: ['Debug']
55-
tutorial_name:
56-
- hello_world
57-
- parent_no_children
58-
- parent_one_child_import_via_extdata
59-
- parent_one_child_no_imports
60-
- parent_two_siblings_connect_import_export
61-
# We will only run the tutorials with GNU make. No need to double up as Ninja is a build test only
62-
requires:
63-
- build-and-test-MAPL-as-<< matrix.build_type >>-on-<< matrix.compiler >>-using-Unix Makefiles
64-
baselibs_version: *baselibs_version
27+
############################################################################################################################
28+
# build-and-test-MAPL: #
29+
# jobs: #
30+
# # For now, we do MAPL builds in GitHub only #
31+
# # Builds MAPL in a "default" way #
32+
# - ci/build: #
33+
# name: build-and-test-MAPL-as-<< matrix.build_type >>-on-<< matrix.compiler >>-using-<< matrix.cmake_generator >> #
34+
# context: #
35+
# - docker-hub-creds #
36+
# matrix: #
37+
# parameters: #
38+
# compiler: [gfortran, ifort, ifx] #
39+
# cmake_generator: ['Unix Makefiles'] #
40+
# build_type: ['Debug'] #
41+
# baselibs_version: *baselibs_version #
42+
# repo: MAPL #
43+
# mepodevelop: false #
44+
# run_unit_tests: true #
45+
# ctest_options: "-L 'ESSENTIAL' --output-on-failure" #
46+
# persist_workspace: false # Needed for MAPL tutorials #
47+
# #
48+
# # Tutorials have been removed (for now) from MAPL3 #
49+
# # NOTE: When we restore tutorials, change persist_workspace to true above!!! #
50+
# ################################################################################################################### #
51+
# # # Run MAPL Tutorials # #
52+
# # - ci/run_mapl_tutorial: # #
53+
# # name: run-<< matrix.tutorial_name >>-Tutorial-with-<< matrix.compiler >>-built-with-<< matrix.build_type >> # #
54+
# # context: # #
55+
# # - docker-hub-creds # #
56+
# # matrix: # #
57+
# # parameters: # #
58+
# # compiler: [ifort] # #
59+
# # build_type: ['Debug'] # #
60+
# # tutorial_name: # #
61+
# # - hello_world # #
62+
# # - parent_no_children # #
63+
# # - parent_one_child_import_via_extdata # #
64+
# # - parent_one_child_no_imports # #
65+
# # - parent_two_siblings_connect_import_export # #
66+
# # # We will only run the tutorials with GNU make. No need to double up as Ninja is a build test only # #
67+
# # requires: # #
68+
# # - build-and-test-MAPL-as-<< matrix.build_type >>-on-<< matrix.compiler >>-using-Unix Makefiles # #
69+
# # baselibs_version: *baselibs_version # #
70+
# ################################################################################################################### #
71+
# #
72+
############################################################################################################################
6573

66-
# Builds MAPL like UFS does (no pFlogger, fargparse, pfunit, static)
67-
- ci/build:
68-
name: build-UFS-MAPL-as-<< matrix.build_type >>-on-<< matrix.compiler >>
69-
context:
70-
- docker-hub-creds
71-
matrix:
72-
parameters:
73-
compiler: [ifort]
74-
build_type: ['Debug']
75-
baselibs_version: *baselibs_version
76-
repo: MAPL
77-
mepodevelop: false
78-
remove_flap: true
79-
remove_pflogger: true
80-
remove_pfunit: true
81-
extra_cmake_options: "-DBUILD_WITH_FLAP=OFF -DBUILD_WITH_PFLOGGER=OFF -DBUILD_WITH_FARGPARSE=OFF -DUSE_EXTDATA2G=OFF -DBUILD_SHARED_MAPL=OFF"
82-
run_unit_tests: true
83-
ctest_options: "-L 'ESSENTIAL' --output-on-failure"
84-
85-
build-and-run-GEOSgcm:
74+
# MAPL3 will soon break GEOSgcm builds. We believe it can build, but not currently run
75+
#build-and-run-GEOSgcm:
76+
build-GEOSgcm:
8677
jobs:
8778
# Build GEOSgcm
8879
- ci/build:
@@ -91,60 +82,89 @@ workflows:
9182
- docker-hub-creds
9283
matrix:
9384
parameters:
94-
compiler: [gfortran, ifort]
85+
# To save CircleCI resources, we build only with ifx for now
86+
#compiler: [gfortran, ifort, ifx]
87+
compiler: [ifx]
9588
baselibs_version: *baselibs_version
9689
repo: GEOSgcm
9790
checkout_fixture: true
98-
mepodevelop: true
91+
fixture_branch: release/MAPL-v3
92+
mepodevelop: false
93+
# MAPL3 GEOSgcm should have the right branches in its components.yaml
94+
# so we do not need to checkout MAPL3 release branches
95+
checkout_mapl3_release_branch: false
9996
checkout_mapl_branch: true
97+
run_regression_tests: true
98+
ctest_options: "-L REGRESSION"
10099
persist_workspace: true # Needs to be true to run fv3/gcm experiment, costs extra, retained for one day
101100

102-
# Run GCM (1 hour, no ExtData)
103-
- ci/run_gcm:
104-
name: run-GCM-on-<< matrix.compiler >>
105-
context:
106-
- docker-hub-creds
107-
matrix:
108-
parameters:
109-
compiler: [gfortran, ifort]
110-
requires:
111-
- build-GEOSgcm-on-<< matrix.compiler >>
112-
repo: GEOSgcm
113-
baselibs_version: *baselibs_version
114-
bcs_version: *bcs_version
101+
######################################################
102+
# # Run GCM (1 hour, no ExtData) #
103+
# - ci/run_gcm: #
104+
# name: run-GCM-on-<< matrix.compiler >> #
105+
# context: #
106+
# - docker-hub-creds #
107+
# matrix: #
108+
# parameters: #
109+
# compiler: [gfortran, ifort, ifx] #
110+
# requires: #
111+
# - build-GEOSgcm-on-<< matrix.compiler >> #
112+
# repo: GEOSgcm #
113+
# baselibs_version: *baselibs_version #
114+
# bcs_version: *bcs_version #
115+
# #
116+
# # Run Coupled GCM (1 hour, no ExtData) #
117+
# - ci/run_gcm: #
118+
# name: run-coupled-GCM-on-<< matrix.compiler >> #
119+
# context: #
120+
# - docker-hub-creds #
121+
# matrix: #
122+
# parameters: #
123+
# compiler: [gfortran, ifort] #
124+
# requires: #
125+
# - build-GEOSgcm-on-<< matrix.compiler >> #
126+
# repo: GEOSgcm #
127+
# baselibs_version: *baselibs_version #
128+
# bcs_version: *bcs_version #
129+
# gcm_ocean_type: MOM6 #
130+
# change_layout: false #
131+
######################################################
115132

116-
# Run Coupled GCM (1 hour, no ExtData)
117-
- ci/run_gcm:
118-
name: run-coupled-GCM-on-<< matrix.compiler >>
133+
# Run GOCART tests
134+
- ci/run_gocart_tests:
135+
name: run-GOCART-tests-on-<< matrix.compiler >>
119136
context:
120137
- docker-hub-creds
121138
matrix:
122139
parameters:
123-
compiler: [ifort]
140+
# To save CircleCI resources, we run GOCART tests only with ifx for now
141+
#compiler: [gfortran, ifort, ifx]
142+
compiler: [ifx]
124143
requires:
125144
- build-GEOSgcm-on-<< matrix.compiler >>
126145
repo: GEOSgcm
127146
baselibs_version: *baselibs_version
128147
bcs_version: *bcs_version
129-
gcm_ocean_type: MOM6
130-
change_layout: false
131148

132-
build-GEOSldas:
133-
jobs:
134-
# Build GEOSldas
135-
- ci/build:
136-
name: build-GEOSldas-on-<< matrix.compiler >>
137-
context:
138-
- docker-hub-creds
139-
matrix:
140-
parameters:
141-
compiler: [gfortran, ifort]
142-
baselibs_version: *baselibs_version
143-
repo: GEOSldas
144-
mepodevelop: false
145-
checkout_fixture: true
146-
fixture_branch: develop
147-
checkout_mapl_branch: true
149+
#########################################################
150+
# build-GEOSldas: #
151+
# jobs: #
152+
# # Build GEOSldas #
153+
# - ci/build: #
154+
# name: build-GEOSldas-on-<< matrix.compiler >> #
155+
# context: #
156+
# - docker-hub-creds #
157+
# matrix: #
158+
# parameters: #
159+
# compiler: [gfortran, ifort] #
160+
# baselibs_version: *baselibs_version #
161+
# repo: GEOSldas #
162+
# mepodevelop: false #
163+
# checkout_fixture: true #
164+
# fixture_branch: release/MAPL-v3 #
165+
# checkout_mapl3_release_branch: false #
166+
# checkout_mapl_branch: true #
167+
#########################################################
148168

149169
######################################################################
150170
# build-GEOSadas: #
@@ -161,7 +181,8 @@ workflows:
161181
# baselibs_version: *baselibs_version #
162182
# repo: GEOSadas #
163183
# checkout_fixture: true #
164-
# fixture_branch: feature/mathomp4/mapldevelop #
184+
# fixture_branch: release/MAPL-v3 #
185+
# checkout_mapl3_release_branch: false #
165186
# checkout_mapl_branch: true #
166187
# mepodevelop: false #
167188
# rebuild_procs: 4 #

0 commit comments

Comments
 (0)