Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1127 commits
Select commit Hold shift + click to select a range
cedfbbf
Add streamInfo argument to the setup_packages routine for all cores
mgduda Nov 16, 2023
8343107
Add streamInfo argument to the get_mesh_stream routine for all cores
mgduda Nov 16, 2023
2541253
Fix halo exchange unit tests in the test core.
jim-p-w Jan 12, 2024
3e242de
Create a function to check the results of halo exchanges.
jim-p-w Jan 16, 2024
56619dc
Remove unused local variables in the halo unit tests.
jim-p-w Jan 17, 2024
2f6a2c1
Merge branch 'test/fix_halo_unit_tests' into develop (PR #1135)
mgduda Jan 18, 2024
b8b9453
Merge branch 'all/streamInfo_for_core_interfaces' into develop (PR #1…
mgduda Jan 19, 2024
9e39cec
Split all time-invariant fields into a separate "invariant" input stream
mgduda Nov 17, 2023
4294287
Add in_defaults=true to invocation of streams_gen for the atmosphere …
mgduda Nov 17, 2023
e2164db
Add in_defaults="false" to the "invariant" input stream in atmosphere…
mgduda Nov 17, 2023
ccecd9b
Read "invariant" stream before "input" or "restart" stream in atm_cor…
mgduda Nov 17, 2023
d388ac2
Define new "no_invariant_stream" package
mgduda Nov 17, 2023
4c415e8
Check for input_interval of invariant stream in setup of packages and…
mgduda Nov 18, 2023
cbba5a4
Merge branch 'atmosphere/invariant_stream' into develop (PR #1137)
mgduda Jan 30, 2024
04c915a
* In ./src/core_atmosphere/physics/mpas_atmphys_control.F, the mesosc…
ldfowler58 Feb 13, 2024
42fb774
* In ./src/core_atmosphere/physics/physics_wrf, removed the variables…
ldfowler58 Feb 13, 2024
e5cf2ac
* In ./src/core_atmosphere/physics/physics_wrf, removed the variables…
ldfowler58 Feb 13, 2024
94c6ccf
* In ./src/core_atmosphere/physics/mpas_atmphys_driver_convection.F, …
ldfowler58 Feb 13, 2024
48411fd
* In ./src/core_atmosphere/physics/physics_wrf, removed the variables…
ldfowler58 Feb 13, 2024
6eb0947
* In ./src/core_atmosphere/physics/mpas_atmphys_vars.F, removed the v…
ldfowler58 Feb 13, 2024
cfe2014
* In ./src/core_atmosphere/physics:
ldfowler58 Feb 14, 2024
bf705f5
Allow MPAS to use either of 'mpi_f08' or 'mpi' modules
mgduda Dec 22, 2023
d82a0e1
Add logic in top-level Makefile to detect mpi_f08 module availability
mgduda Feb 16, 2024
b603822
Merge branch 'framework/mpas_use_mpi_f08' into develop (PR #1142)
mgduda Feb 21, 2024
243001d
* In ./src/core_atmosphere/physics:
ldfowler58 Feb 27, 2024
35b28c7
Generalize mpas_sphere_angle function to work for non-unit-radius sph…
mgduda Mar 5, 2024
5f41f66
Merge mpas_dmpar_exch_halo_adj_field2d_real() from the
jim-p-w Mar 11, 2024
aa507fd
Add unit tests to verify the halo adjoint exchange.
jim-p-w Mar 11, 2024
b856552
* In ./src/core_atmosphere/physics/mpas_atmphys_driver_lsm.F, now wei…
ldfowler58 Mar 12, 2024
348f404
* In ./src/core_atmosphere/physics/mpas_atmphys_driver_lsm.F, moved t…
ldfowler58 Mar 12, 2024
9571d54
Merge branch 'NSF-MPAS/lsm_sfcdiags' into develop (PR #1147)
mgduda Mar 20, 2024
442b7e5
* In ./src/core_atmosphere/physics, added the file mpas_atmphys_drive…
ldfowler58 Mar 13, 2024
bfdc9d2
Initialize mvd_r and mvd_c before first use in Thompson microphysics …
mgduda Mar 21, 2024
c5c46e7
Merge branch 'operators/sphere_angle_nonunit_radius_fix' into hotfix-…
mgduda Mar 22, 2024
098e9c2
Merge branch 'atmosphere/thompson_uninit_mvd_fix' into hotfix-v8.0.2 …
mgduda Mar 22, 2024
46a9d10
Remove LIBS from openacc_test in top-level Makefile
Mar 25, 2024
9e1e1b4
* In ./src/core_atmosphere/physics/mpas_atmphys_driver_cloudiness.F, …
ldfowler58 Mar 23, 2024
3f6d870
Merge branch 'mp_thompson_cldfra' into hotfix-v8.0.2 (PR #1153)
mgduda Mar 25, 2024
585c96a
Merge branch 'hotfix-v8.0.2'
mgduda Mar 26, 2024
b8393e1
Merge branch 'NSF-MPAS/init_physics_flags' into develop (PR #1141)
mgduda Mar 26, 2024
04fdc37
Merge branch 'framework/fix_makefile_openacctest' into develop (PR #1…
mgduda Mar 26, 2024
62b1e27
* In ./src/core_atmosphere/physics/mpas_atmphys_driver.F, added OpenM…
ldfowler58 Mar 27, 2024
6663395
* In ./src/core_atmosphere/physics/mpas_atmphys_driver_seaice.F, upda…
ldfowler58 Mar 27, 2024
c057136
Merge branch 'NSF-MPAS/lsm_seaice' into develop (PR #1151)
mgduda Mar 27, 2024
52c1e92
Merge branch 'master' into develop
mgduda Mar 27, 2024
da893ed
Add '-std=f2008' to FFLAGS_DEBUG for the 'gnu' build target
mgduda Mar 27, 2024
c44e92f
* In ./src/core_atmosphere/physics, updated the MYNN surface layer sc…
ldfowler58 Feb 14, 2024
721fe98
* In ./src/core_atmosphere/physics, very minor corrections to Makefile,
ldfowler58 Feb 18, 2024
869daba
* In ./src/core_atmosphere/physics/physics_mmm, very minor correction…
ldfowler58 Feb 19, 2024
f546a61
* In ./src/core_atmosphere/physics, updated the MYNN PBL with the sou…
ldfowler58 Feb 19, 2024
5adbb63
* In ./src/core_atmosphere/physics/physics_mmm/bl_mynn_subroutines.F,…
ldfowler58 Feb 20, 2024
53adb03
* In ./src/core_atmosphere/physics, made minor corrections to ./physi…
ldfowler58 Feb 23, 2024
0932f85
* In ./src/core_atmosphere/physics/physics_mmm/bl_mynn_subroutines.F,…
ldfowler58 Mar 23, 2024
dca809d
* In ./src/core_atmosphere/physics/physics_mmm/bl_mynn.F, removed the…
ldfowler58 Mar 23, 2024
f675c4d
* In ./src/core_atmosphere/physics/physics_mmm/bl_mynn_subroutines.F,…
ldfowler58 Mar 25, 2024
b2da0c9
* In ./src/core_atmosphere/physics:
ldfowler58 Mar 25, 2024
ae1c058
* In ./src/core_atmosphere/Registry.xml, changed the option config_my…
ldfowler58 Mar 25, 2024
c3447dc
* In ./src/core_atmosphere/physics:
ldfowler58 Mar 22, 2024
4083ad2
* In ./src/core_atmosphere/physics:
ldfowler58 Mar 24, 2024
7cc8db7
* In ./src/core_atmosphere/physics:
ldfowler58 Mar 24, 2024
b31a817
* In ./src/core_atmosphere/physics:
ldfowler58 Mar 24, 2024
750ffc3
* In ./src/core_atmosphere/physics:
ldfowler58 Mar 25, 2024
b0b1dc9
* In ./src/core_atmosphere/physics/physics_mm/bl_mynn.F, removed extr…
ldfowler58 Mar 25, 2024
035f192
* In ./src/core_atmosphere/physics/mpas_atmphys_driver_pbl.F, comment…
ldfowler58 Mar 27, 2024
724eaf4
* In ./src/core_atmosphere/physics/physics_mmm/bl_mynn_subroutines.F,…
ldfowler58 Mar 28, 2024
0e0ef17
Merge branch 'framework/gnu_debug_f08_flag' into develop (PR #1156)
mgduda Mar 28, 2024
fe40f8c
Merge branch 'NSF-MPAS/bl_mynn_updated' into develop (PR #1155)
mgduda Mar 28, 2024
eab4b32
Update version number to 8.1.0
mgduda Mar 28, 2024
d5ec944
Move call to halo exchange adjoint tests in test core
mgduda Apr 2, 2024
d9331c6
Adjust whitespace in comment block for mpas_dmpar_exch_halo_adj_field…
mgduda Apr 2, 2024
65acbd5
Update comments for halo exch adjoint tests in test_core_halo_exch mo…
mgduda Apr 2, 2024
4c3682e
Merge branch 'framework/merge_halo_adjoint' into develop (PR #1138)
mgduda Apr 5, 2024
ec63172
* In ./src/core_atmosphere/physics/physics_mmm/bl_ysu.F, added the in…
ldfowler58 Apr 3, 2024
e8d41c6
Merge branch 'NSF-MPAS/bl_ysu' into release-v8.1.0 (PR #1159)
mgduda Apr 9, 2024
279df94
Fix memory leaks due to duplicate `allocate` calls on pointers
kuanchihwang Apr 3, 2024
f9cfd78
Merge branch 'develop-fix-memory-leaks' into release-v8.1.0 (PR #1160)
mgduda Apr 16, 2024
f084b36
Merge branch 'release-v8.1.0'
mgduda Apr 18, 2024
02ce769
Merge branch 'master' into develop
mgduda Apr 26, 2024
d885ef1
* Made a couple of corrections in subroutines advance_scalars and atm…
ldfowler58 Apr 30, 2024
0e1e967
Merge branch 'NSF-MPAS/advance_scalars' into develop (PR #1162)
mgduda May 1, 2024
60facc5
Add routine for reporting compile- and run-time settings to the log file
mgduda May 2, 2024
4606b18
Use mpas_framework_report_settings in atm_setup_log for atmosphere core
mgduda May 2, 2024
3a4bece
Use mpas_framework_report_settings in init_atm_setup_log for init_atm…
mgduda May 2, 2024
a4c2a93
Merge branch 'all/log_runtime_settings' into develop (PR #1163)
mgduda May 3, 2024
2acc92a
Include OpenACC device info in mpas_framework_report_settings output
mgduda May 3, 2024
df25b94
Add "-check all" to LDFLAGS_DEBUG for 'intel' build target
mgduda May 3, 2024
61f0bd0
Merge branch 'framework/report_acc_devices' into develop (PR #1164)
mgduda May 7, 2024
e4a4c0a
Move 21 additional fields into the "invariant" stream in the atmosphe…
mgduda May 16, 2024
f9e2c6a
Add stream_function and velocity_potential fields to the diag struct.
jim-p-w May 16, 2024
4f04d2a
Merge branch 'atmosphere/invariant_static_fields' into develop (PR #1…
mgduda May 21, 2024
f2f44b6
Merge branch 'atmosphere/new_diag_fields' into develop (PR #1166)
mgduda May 21, 2024
308b146
Add da_state input/output stream.
jim-p-w May 21, 2024
369341a
Merge branch 'atmosphere/add_da_state_stream' into develop (PR #1167)
mgduda May 22, 2024
bee30cc
* In ./src/core_atmosphere/physics/physics_mmm, changes all the file …
ldfowler58 May 2, 2024
a6d3d96
* In ./src/core_atmosphere/physics/physics_mmm, updated bl_gwdo.F90 w…
ldfowler58 May 2, 2024
e46c9e9
* In ./src/core_atmosphere/physics/physics_mmm, updated bl_ysu.F90 wi…
ldfowler58 May 2, 2024
342e75b
* In ./src/core_atmosphere/physics, updated ./physics_mmm/cu_ntiedtke…
ldfowler58 May 2, 2024
6d75dcd
* In ./src/core_atmosphere/physics/physics_wrf, finished to update mo…
ldfowler58 May 3, 2024
018424a
* In ./src/core_atmosphere/physics:
ldfowler58 May 6, 2024
9525600
* In ./src/core_atmosphere/physics/physics_mmm, updated bl_mynn.F90 w…
ldfowler58 May 21, 2024
da5af8b
* In ./src/core_atmosphere/physics/physics_mmm/cu_ntiedtke.F90, added…
ldfowler58 May 24, 2024
2bc7b6b
* In ./src/core_atmosphere/physics/physics_mmm, updated mp_wsm6.F90 w…
ldfowler58 May 22, 2024
469e866
* In ./src/core_atmosphere/physics:,
ldfowler58 May 23, 2024
474c9a9
* As an intermediary step to moving ./physics_mmm to its own reposito…
ldfowler58 May 23, 2024
37a6056
Remove Fortran only flag from LDFLAGS_DEBUG for NV targets
May 23, 2024
d15d8c4
Add optional CMake build for atmosphere and init_atmosphere core of M…
amstokely May 22, 2024
82dc4d0
Merge branch 'atmosphere/feature_cmake' into develop (PR #1169)
mgduda May 29, 2024
5e8c15e
Copy invariant fields used by scalar transport via OpenACC data direc…
mgduda May 29, 2024
8fc105a
* In ./src/core_atmosphere/physics/mpas_atmphys_driver_pbl.F, comment…
ldfowler58 Apr 26, 2024
4e55180
* In ./src/core_init_atmosphere:
ldfowler58 Apr 10, 2024
6f469e3
* In ./src/core_atmosphere/physics/physics_wrf, updated module_mp_tho…
ldfowler58 Apr 10, 2024
ef47cf8
* In ./src/core_atmosphere/physics, started the implementation of the…
ldfowler58 Apr 11, 2024
8e00576
* In ./src/core_atmosphere/Registry.xml, ./src/core_atmosphere/dynami…
ldfowler58 Apr 26, 2024
797bc7b
* In ./src/core_atmosphere/physics, added the option "mp_thompson_aer…
ldfowler58 May 14, 2024
e0fca28
* In ./src/core_atmosphere/physics, cleaned-up mpas_atmphys_todynamic…
ldfowler58 May 16, 2024
47a10c3
* In ./src/core_atmosphere/physics, added the PBL and free-tropospher…
ldfowler58 May 18, 2024
2e2dd22
* In ./src/core_atmosphere/physics, added the RRTMG shortwave aerosol…
ldfowler58 May 18, 2024
4631593
* In ./src/core_atmosphere/physics/mpas_atmphys_finalize, added the o…
ldfowler58 May 29, 2024
ca3021f
* In src/core_init_atmosphere/mpas_init_atm_thompson_aerosols.F, corr…
ldfowler58 May 29, 2024
b2be6f3
* In ./src/core_atmosphere/physics/mpas_atmphys_init_microphysics.F, …
ldfowler58 May 30, 2024
77262dc
Add OpenACC directives throughout atm_advance_scalars_work
mgduda May 30, 2024
50aab62
Add OpenACC directives throughout atm_advance_scalars_mono_work
mgduda May 30, 2024
d6e56eb
Merge branch 'atmosphere/openacc_build_flags' into develop (PR #1174)
mgduda May 30, 2024
148dc18
* Initial implementation of the Noah-MP land surface scheme (LSM):
ldfowler58 Mar 3, 2024
3ed206a
* In ./src/core_atmosphere/physics and ./src/core_atmosphere/physics/…
ldfowler58 Mar 4, 2024
71e837a
* In ./src/core_atmosphere/Makefile, now link ./physics/physics_noahm…
ldfowler58 Mar 4, 2024
6a49799
* In ./src/core_atmosphere/physics:
ldfowler58 Mar 4, 2024
98040ef
* In ./src/core_atmosphere/physics/physics_noahmp/drivers/mpas, remov…
ldfowler58 Mar 4, 2024
f89e111
* In ./src/core_atmosphere/physics/physics_noahmp/drivers/mpas, added…
ldfowler58 Mar 4, 2024
d4a1c7f
* In ./src/core_init_atmosphere, added the initialization of the stat…
ldfowler58 Mar 4, 2024
607e23f
* In ./src/core_atmosphere, starting the first modifications to run t…
ldfowler58 Mar 5, 2024
57b2e9b
* In ./src/core_atmosphere/physics/physics_noahmp/drivers/mpas/Noahmp…
ldfowler58 Apr 4, 2024
6375190
* In ./src/core_atmosphere/physics/physics_noahmp/drivers/mpas/Noahmp…
ldfowler58 Apr 4, 2024
07976a3
* In ./src/core_atmosphere/physics/physics_noahmp/drivers/mpas/Noahmp…
ldfowler58 Apr 4, 2024
5be8e1f
* In ./src/core_atmosphere:
ldfowler58 Apr 4, 2024
7e5b5dd
Merge branch 'atmosphere/acc_scalar_transport' into develop (PR #1176)
mgduda May 31, 2024
cfd9563
Add module to exercise OpenACC to the test core
May 14, 2024
316e961
Add mpas_test_openacc to build and test_core_run
May 22, 2024
77f3ce6
Add new variables to test_core Registry for OpenACC tests
May 28, 2024
a3f0f6f
Add representative array routines to OpenACC tests
May 23, 2024
b276568
Remove OpenACC stub test, fix a comment
May 30, 2024
63fdcf7
Merge branch 'framework/openacc_test' into develop (PR #1175)
mgduda May 31, 2024
ee94ddd
* In src/core_atmosphere/physics/checkout_data_files.sh, updated mpas…
ldfowler58 Jun 4, 2024
aaae249
* In ./src/core_init_atmosphere/mpas_init_atm_thompson_aerosols.F, co…
ldfowler58 Jun 4, 2024
7b951b9
* In ./src/core_atmosphere/physics/physics_wrf/module_ra_rrtmg_sw_aer…
ldfowler58 Jun 4, 2024
d486b14
* In src/core_init_atmosphere/mpas_init_atm_thompson_aerosols.F, corr…
ldfowler58 Jun 6, 2024
f7866fb
* In ./src/core_atmosphere/Registry.xml, corrected the description of…
ldfowler58 Jun 6, 2024
8c47a0b
* In ./src/core_atmosphere, added the subdirectory "tools". At presen…
ldfowler58 May 23, 2024
f86a8c9
* In ./src/core_atmosphere/physics,removed the directory physics_mmm.
ldfowler58 May 24, 2024
9182d0c
* In ./src/core_atmosphere/physics:
ldfowler58 May 24, 2024
2c53175
* In ./src/core_atmosphere, added the file Externals.cfg. This file i…
ldfowler58 May 24, 2024
db714b1
Merge branch 'NSF-MPAS/manage_externals' into develop (PR #1171)
mgduda Jun 7, 2024
cab1007
* In ./src/core_init_atmosphere/mpas_init_atm_thompson_aerosols.F, re…
ldfowler58 Jun 10, 2024
9ca55d8
* In ./src/core_init_atmosphere, do not include the Thompson water- a…
ldfowler58 Jun 7, 2024
3318144
* In ./src/core_init_atmosphere/mpas_init_atm_thompson_aerosols.F, ad…
ldfowler58 Jun 11, 2024
04024a6
When running the 'parse' tool, provide Registry file as command-line …
mgduda Jun 12, 2024
11f4894
* In ./src/core_init_atmosphere, continued the implementation of the …
ldfowler58 Jun 13, 2024
a52a8f0
* In ./src/core_atmosphere/physics:
ldfowler58 Apr 4, 2024
ab192ea
* In ./src/core_atmosphere/physics:
ldfowler58 Apr 4, 2024
74e553f
* In ./src/core_atmosphere/physics/Registry_noahmp.xml, added the arg…
ldfowler58 Apr 8, 2024
8fb2b52
* In ./src/core_atmosphere/physics/mpas_atmphys_lsm_noahmpinit.F, rem…
ldfowler58 Apr 8, 2024
cd075a3
* In ./src/core_atmosphere/physics/mpas_atmphys_driver_lsm_noahmp.F, …
ldfowler58 Apr 8, 2024
99ba47f
* In src/core_atmosphere/physics/physics_noahmp/drivers/mpas:
ldfowler58 Apr 13, 2024
52d40ca
* In ./src/core_atmosphere/physics/mpas_atmphys_driver_lsm_noahmp.F, …
ldfowler58 Apr 13, 2024
6e2f2c5
* In Makefile, removed the option "-fp-model precise" for the ifort o…
ldfowler58 May 30, 2024
76a8a3d
* In ./src/core_atmosphere/Registry.xml:
ldfowler58 May 30, 2024
6cafc95
* In ./src/core_atmosphere/physics:
ldfowler58 Jun 6, 2024
6e23176
* In src/core_atmosphere/Registry.xml, removed the static fields need…
ldfowler58 Jun 6, 2024
5bebea3
* In ./src/core_atmosphere/physics/mpas_atmphys_lsm_noahmpinit.F, com…
ldfowler58 Jun 6, 2024
ca68747
* In ./src/core_atmosphere/physics/Registry_noahmp.xml, corrected the…
ldfowler58 Apr 13, 2024
1b4a479
* In ./src/core_atmosphere/physics/mpas_atmphys_lsm_noahmpinit.F, rem…
ldfowler58 Jun 12, 2024
afc482d
* In ./src/core_atmosphere/physics, deallocate all Noah-MP arrays nee…
ldfowler58 May 28, 2024
9e7b4d4
Change URL for MMM-physics external to use https rather than git
mgduda Jun 13, 2024
3bd1cdd
Add new function 'parse_macros' to registry tool utility code
mgduda Jun 12, 2024
b8f077c
Generate core_variables.inc and domain_variables.inc using run-time m…
mgduda Jun 13, 2024
6a680ce
Merge branch 'tools/core_independent_parse' into develop (PR #1180)
mgduda Jun 13, 2024
48d7649
Implement new Makefile logic for sharing framework builds across cores
mgduda May 8, 2024
8ecc35d
Merge branch 'NSF-MPAS/lsm_noahmp' into develop (PR #1161)
mgduda Jun 13, 2024
a6e40c9
Merge branch 'framework/reuse_framework_build' into develop (PR #1179)
mgduda Jun 13, 2024
a10e416
* In ./src/core_atmosphere/dynamics/mpas_atm_time_integration.F, appl…
ldfowler58 Jun 13, 2024
d3fa9aa
* In ./src/core_atmosphere, modified sourcecode so that the option mp…
ldfowler58 Jun 14, 2024
a581b79
Merge branch 'atmosphere/fix_mmm-physics_url' into develop (PR #1181)
mgduda Jun 17, 2024
cfb4df8
* In ./src/core_atmosphere/dynamics/mpas_atm_time_integration.F, corr…
ldfowler58 Jun 18, 2024
8b1a42a
* In ./src/core_atmosphere/physics/mpas_atmphys_control.F, increased …
ldfowler58 Jun 18, 2024
7e163ce
* In ./src/core_init_atmosphere/mpas_init_atm_thompson_aerosols.F:
ldfowler58 Jun 18, 2024
007c78c
Parallelize the remapping of Noah-MP static fields in init_atmosphere…
mgduda Jun 13, 2024
b197a5a
Merge branch 'init_atmosphere/parallel_noahmp_static' into develop (P…
mgduda Jun 19, 2024
e031786
* In ./src/core_init_atmosphere, removed the variables nifa_gocart_cl…
ldfowler58 Jun 19, 2024
6c418fc
* In ./src/core_atmosphere/physics:
ldfowler58 Jun 19, 2024
59c357b
* In ./src/core_atmosphere/physics/mpas_atmphys_control.F, replaced t…
ldfowler58 Jun 19, 2024
e76f762
Merge branch 'NSF-MPAS/sf_sfclayrev' into develop (PR #1183)
mgduda Jun 19, 2024
e094c07
Merge branch 'NSF-MPAS/mp_thompson' into develop (PR #1177)
mgduda Jun 20, 2024
f7ceee6
Work around Noah-MP compilation issues with GNU -std=f2008 flag
mgduda Jun 20, 2024
b6db7d6
Add ONLY clause to USE statements for the 'mpi_f08' module
mgduda Jun 6, 2024
e682f81
Fix issue in destroying halo groups when there are multiple domain in…
mgduda Jun 19, 2024
5b82e71
Merge branch 'atmosphere/halo_method_multidomain_fix' into develop (P…
mgduda Jun 20, 2024
7070294
Merge branch 'atmosphere/noahmp_no_f2008_flag' into develop (PR #1186)
mgduda Jun 20, 2024
36c0112
Improve check on deallocation of hash table in mpas_geotile_mgr_finalize
mgduda Jun 20, 2024
8b1c501
Update version number to 8.2.0
mgduda Jun 21, 2024
45c4f27
Merge branch 'framework/ifx_check_all_fix' into release-v8.2.0 (PR #1…
mgduda Jun 21, 2024
d00c950
Merge branch 'framework/mpi_f08_use_only' into release-v8.2.0 (PR #1188)
mgduda Jun 21, 2024
f4c5e16
Merge branch 'init_atmosphere/improve_geotile_dealloc' into release-v…
mgduda Jun 21, 2024
c740150
Add module search paths to support compilation of Noah-MP code with n…
mgduda Jun 21, 2024
ec13b48
Merge branch 'atmosphere/fix_nvhpc_phys_builds' into release-v8.2.0 (…
mgduda Jun 24, 2024
5e27ed0
Add 'sf_noahmp_in' package to Noah-MP static fields in atmosphere cor…
mgduda Jun 24, 2024
86def44
Merge branch 'atmosphere/noahmp_static_package' into release-v8.2.0 (…
mgduda Jun 26, 2024
ffe5baf
Add missing dependency among physics in MPAS-A main physics Makefile
mgduda Jun 21, 2024
9bf3e24
Split physics source compilation from library updates for parallel bu…
mgduda Jun 26, 2024
d98af64
Merge branch 'atmosphere/fix_parallel_phys_builds' into release-v8.2.…
mgduda Jun 27, 2024
3cc8451
Ignore the entire physics_mmm subdirectory of src/core_atmosphere/phy…
mgduda Jun 27, 2024
14dda2b
Don't include FCINCLUDES in build options checked for build compatibi…
mgduda Jun 27, 2024
e4b2484
Add 'sf_noahmp' to list of possible_values for config_lsm_scheme
mgduda Jun 27, 2024
0c14082
Add 'mp_thompson_aerosols' to list of possible_values for config_micr…
mgduda Jun 27, 2024
8263af9
Fix instances of incorrect quotes in init_atmosphere and atmosphere r…
mgduda Jun 27, 2024
cff0da1
Merge branch 'atmosphere/fix_registry_syntax_errs' into release-v8.2.…
mgduda Jun 27, 2024
e5271b8
Merge branch 'atmosphere/ignore_physics_mmm' into release-v8.2.0 (PR …
mgduda Jun 27, 2024
2b551bd
Merge branch 'atmosphere/add_noahmp_possible_value' into release-v8.2…
mgduda Jun 27, 2024
760f9de
Merge branch 'atmosphere/add_thompson_aero_possible_value' into relea…
mgduda Jun 27, 2024
82681e9
Merge branch 'framework/no_FCINCLUDES_check' into release-v8.2.0 (PR …
mgduda Jun 27, 2024
942d402
Merge branch 'release-v8.2.0'
mgduda Jun 28, 2024
6f29a73
Update version number to 8.2.1
mgduda Jun 28, 2024
90758d5
Use more mpi_f08 features in mpi_f08_test for odd cases where certain
islas Jun 28, 2024
0ca4208
Check for libpnetcdf library existence rather than just directory
islas Jun 28, 2024
3af54a8
Remove debugging prints around calls to sfclayrev in driver_sfclayer
mgduda Jul 5, 2024
4fc799e
Merge branch 'atmosphere/remove_sfclayrev_prints' into hotfix-v8.2.1 …
mgduda Jul 6, 2024
660ab51
Add mpas_dmpar_bcast_real4s routine for broadcasting real(kind=R4KIND…
mgduda Jul 8, 2024
6b705bc
Correct double-precision build failures of mpas_atmphys_init_microphy…
mgduda Jul 9, 2024
01340f6
Merge branch 'framework/bcast_real4s' into hotfix-v8.2.1 (PR #1207)
mgduda Jul 10, 2024
858675e
Merge branch 'atmosphere/fix_r8_builds' into hotfix-v8.2.1 (PR #1208)
mgduda Jul 10, 2024
90f7f7f
* In ./src/core_atmosphere/physics/physics_wrf/Makefile, corrected al…
ldfowler58 Jul 15, 2024
74ddbd0
Restore CMake support for building the atmosphere core
amstokely Jun 25, 2024
2c3e974
Restore CMake support for building the init_atmosphere core
amstokely Jul 8, 2024
84724d5
* In ./src/core_atmosphere//physics/mpas_atmphys_driver_microphysics.…
ldfowler58 Jul 16, 2024
7f2640a
Merge branch 'atmosphere/fix_cmake' into hotfix-v8.2.1 (PR #1205)
mgduda Jul 16, 2024
39ae1df
Merge branch 'NSF-MPAS/physics_Makefile_tabs' into hotfix-v8.2.1 (PR …
mgduda Jul 16, 2024
01faa8e
Merge branch 'mpi_f08-enhancedCheck' into hotfix-v8.2.1 (PR #1202)
mgduda Jul 17, 2024
fe46d4f
Check for the libnetcdf library existence similar to pnetcdf
islas Jul 2, 2024
bbcb89d
* In ./src/core_atmosphere:
ldfowler58 Jul 17, 2024
c314013
Merge branch 'check-pnetcdf-exists' into hotfix-v8.2.1 (PR #1203)
mgduda Jul 19, 2024
5f25019
Add core_physic-specific dependencies to mpas_atmphys_lsm_noahmpfinal…
islas Jun 28, 2024
520d165
Fix MPAS-A dycore-only build
kuanchihwang Aug 1, 2024
0a8dd86
Merge branch 'mpas_atmphys_lsm_noahmpfinalize-deps' into hotfix-v8.2.…
mgduda Aug 6, 2024
93e2ac5
Merge branch 'stg/fix-dycore-only-build' into hotfix-v8.2.1 (PR #1221)
mgduda Aug 6, 2024
a11aef6
Merge branch 'NSF-MPAS/physics_big_fix_zd' into hotfix-v8.2.1 (PR #1213)
mgduda Aug 6, 2024
ba80002
* In ./src/core_init_atmosphere/mpas_init_atm_thompson_aerosols.F, ch…
ldfowler58 Aug 6, 2024
bd4d0e0
* In ./src/core_atmosphere/physics/mpas_atmphys_driver_radiation_sw.F…
ldfowler58 Aug 6, 2024
48b1934
Merge branch 'NSF-MPAS/physics_fix_tend_scalars' into hotfix-v8.2.1 (…
mgduda Aug 6, 2024
717a186
Merge branch 'NSF-MPAS/physics_minor_bugs_1' into hotfix-v8.2.1 (PR #…
mgduda Aug 7, 2024
dd7d751
Merge branch 'NSF-MPAS/physics_minor_bugs_3' into hotfix-v8.2.1 (PR #…
mgduda Aug 7, 2024
b566fc8
Merge branch 'hotfix-v8.2.1'
mgduda Aug 7, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
5 changes: 3 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ restart_timestamp

# Text files (For statistical output from ocean model)
*.txt
!CMakeLists.txt

# Directories with individual .gitignore files are:
# src/external (Externals might have a different compilation method)
Expand All @@ -47,8 +48,8 @@ restart_timestamp
*.TBL
*DATA*

# Ignore MPAS core build files.
.mpas_core_*
# Files for detecting whether builds of cores or shared framework can be reused
.build_opts*

# Ignore all runtime config files
namelist.*
Expand Down
160 changes: 160 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,160 @@
## MPAS-Model
cmake_minimum_required(VERSION 3.12)

include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Functions/MPAS_Functions.cmake)
get_mpas_version(MPAS_VERSION)
project(MPAS LANGUAGES C Fortran VERSION ${MPAS_VERSION} DESCRIPTION "MPAS - Model for Prediction Across Scales")

list(INSERT CMAKE_MODULE_PATH 0 ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules)
set(CMAKE_DIRECTORY_LABELS ${PROJECT_NAME})
include(GNUInstallDirs)

# Options
set(MPAS_ALL_CORES atmosphere init_atmosphere)
set(MPAS_CORES atmosphere CACHE STRING "MPAS cores to build. Options: ${MPAS_ALL_CORES}")
if(MPAS_CORES MATCHES " ") #Convert strings separated with spaces to CMake list separated with ';'
string(REPLACE " " ";" MPAS_CORES ${MPAS_CORES})
set(MPAS_CORES ${MPAS_CORES} CACHE STRING "MPAS cores to build. Options: ${MPAS_ALL_CORES}" FORCE)
endif()
option(DO_PHYSICS "Use built-in physics schemes." TRUE)
option(MPAS_DOUBLE_PRECISION "Use double precision 64-bit Floating point." TRUE)
option(MPAS_PROFILE "Enable GPTL profiling" OFF)
option(MPAS_OPENMP "Enable OpenMP" OFF)
option(BUILD_SHARED_LIBS "Build shared libraries" ON)

message(STATUS "[OPTION] MPAS_CORES: ${MPAS_CORES}")
message(STATUS "[OPTION] MPAS_DOUBLE_PRECISION: ${MPAS_DOUBLE_PRECISION}")
message(STATUS "[OPTION] MPAS_PROFILE: ${MPAS_PROFILE}")
message(STATUS "[OPTION] MPAS_OPENMP: ${MPAS_OPENMP}")
message(STATUS "[OPTION] BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}")

# Build product output locations
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)

# Set default build type to RelWithDebInfo
if(NOT CMAKE_BUILD_TYPE)
message(STATUS "Setting default build type to Release. Specify CMAKE_BUILD_TYPE to override.")
set(CMAKE_BUILD_TYPE "Release" CACHE STRING "CMake Build type" FORCE)
set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release" "MinSizeRel" "RelWithDebInfo")
endif()

# Detect MPAS git version
if(NOT MPAS_GIT_VERSION)
find_package(Git QUIET)
if(GIT_FOUND)
execute_process(COMMAND ${GIT_EXECUTABLE} describe --dirty
WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
OUTPUT_VARIABLE _mpas_git_version
ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
else()
set(_mpas_git_version "Unknown")
endif()
set(MPAS_GIT_VERSION ${_mpas_git_version} CACHE STRING "MPAS-Model git version")
endif()

### Dependencies
find_package(OpenMP COMPONENTS Fortran)
find_package(MPI REQUIRED COMPONENTS Fortran)
find_package(NetCDF REQUIRED COMPONENTS Fortran C)
find_package(PnetCDF REQUIRED COMPONENTS Fortran)
find_package(PIO REQUIRED COMPONENTS Fortran C)
if(MPAS_PROFILE)
find_package(GPTL REQUIRED)
endif()

# Find C pre-processor
if(CMAKE_C_COMPILER_ID MATCHES GNU)
find_program(CPP_EXECUTABLE NAMES cpp REQUIRED)
set(CPP_EXTRA_FLAGS -traditional)
elseif(CMAKE_C_COMPILER_ID MATCHES "(Apple)?Clang" )
find_program(CPP_EXECUTABLE NAMES cpp REQUIRED)
else()
message(STATUS "Unknown compiler: ${CMAKE_C_COMPILER_ID}")
set(CPP_EXECUTABLE ${CMAKE_C_COMPILER})
endif()

## Common Variables

# Fortran module output directory for build interface
set(MPAS_MODULE_DIR ${PROJECT_NAME}/module/${CMAKE_Fortran_COMPILER_ID}/${CMAKE_Fortran_COMPILER_VERSION})
# Install Fortran module directory
install(DIRECTORY ${CMAKE_BINARY_DIR}/${MPAS_MODULE_DIR}/ DESTINATION ${CMAKE_INSTALL_LIBDIR}/${MPAS_MODULE_DIR}/)

# Location of common subdriver module compiled by each cores
set(MPAS_MAIN_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/driver/mpas.F)
set(MPAS_SUBDRIVER_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/driver/mpas_subdriver.F)

## Create targets
add_subdirectory(src/external/ezxml) # Target: MPAS::external::ezxml
if(ESMF_FOUND)
message(STATUS "Configure MPAS for external ESMF")
add_definitions(-DMPAS_EXTERNAL_ESMF_LIB -DMPAS_NO_ESMF_INIT)
add_library(${PROJECT_NAME}::external::esmf ALIAS esmf)
else()
message(STATUS "Configure MPAS for internal ESMF")
add_subdirectory(src/external/esmf_time_f90) # Target: MPAS::external::esmf_time
endif()
add_subdirectory(src/tools/input_gen) # Targets: namelist_gen, streams_gen
add_subdirectory(src/tools/registry) # Targets: mpas_parse_<core_name>
add_subdirectory(src/framework) # Target: MPAS::framework
add_subdirectory(src/operators) # Target: MPAS::operators

foreach(_core IN LISTS MPAS_CORES)
add_subdirectory(src/core_${_core}) # Target: MPAS::core::<core_name>
endforeach()

### Package config
include(CMakePackageConfigHelpers)

# Build-tree target exports
export(EXPORT ${PROJECT_NAME}ExportsExternal NAMESPACE ${PROJECT_NAME}::external:: FILE ${PROJECT_NAME}-targets-external.cmake)
export(EXPORT ${PROJECT_NAME}Exports NAMESPACE ${PROJECT_NAME}:: FILE ${PROJECT_NAME}-targets.cmake)
export(EXPORT ${PROJECT_NAME}ExportsCore NAMESPACE ${PROJECT_NAME}::core:: FILE ${PROJECT_NAME}-targets-core.cmake)

# CMake Config file install location
set(CONFIG_INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
# Install MPAS-supplied Find<Pkg>.cmake modules for use by downstream CMake dependencies
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules DESTINATION ${CONFIG_INSTALL_DESTINATION})

## <pkgname>-config.cmake: build-tree
# Variables to export for use from build-tree
set(BINDIR ${CMAKE_BINARY_DIR}/bin)
set(CORE_DATADIR_ROOT ${CMAKE_BINARY_DIR}/${PROJECT_NAME})
set(CMAKE_MODULE_INSTALL_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules)
string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
configure_package_config_file(cmake/PackageConfig.cmake.in ${PROJECT_NAME_LOWER}-config.cmake
INSTALL_DESTINATION .
INSTALL_PREFIX ${CMAKE_CURRENT_BINARY_DIR}
PATH_VARS BINDIR CORE_DATADIR_ROOT CMAKE_MODULE_INSTALL_PATH)

## <pkgname>-config.cmake: install-tree
# Variables to export for use from install-tree
set(BINDIR ${CMAKE_INSTALL_BINDIR})
set(CORE_DATADIR_ROOT ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME})
set(CMAKE_MODULE_INSTALL_PATH ${CONFIG_INSTALL_DESTINATION}/Modules)
configure_package_config_file(cmake/PackageConfig.cmake.in install/${PROJECT_NAME_LOWER}-config.cmake
INSTALL_DESTINATION ${CONFIG_INSTALL_DESTINATION}
PATH_VARS BINDIR CORE_DATADIR_ROOT CMAKE_MODULE_INSTALL_PATH)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/install/${PROJECT_NAME_LOWER}-config.cmake
DESTINATION ${CONFIG_INSTALL_DESTINATION})

## <pkgname>-config-version.cmake
write_basic_package_version_file(
${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME_LOWER}-config-version.cmake
VERSION ${PROJECT_VERSION}
COMPATIBILITY AnyNewerVersion)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME_LOWER}-config-version.cmake
DESTINATION ${CONFIG_INSTALL_DESTINATION})

## package-targets.cmake and package-targets-<build-type>.cmake
install(EXPORT ${PROJECT_NAME}ExportsExternal NAMESPACE ${PROJECT_NAME}::external::
FILE ${PROJECT_NAME_LOWER}-targets-external.cmake
DESTINATION ${CONFIG_INSTALL_DESTINATION})
install(EXPORT ${PROJECT_NAME}Exports NAMESPACE ${PROJECT_NAME}::
FILE ${PROJECT_NAME_LOWER}-targets.cmake
DESTINATION ${CONFIG_INSTALL_DESTINATION})
install(EXPORT ${PROJECT_NAME}ExportsCore NAMESPACE ${PROJECT_NAME}::core::
FILE ${PROJECT_NAME_LOWER}-targets-core.cmake
DESTINATION ${CONFIG_INSTALL_DESTINATION})
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2013-2018, Los Alamos National Security, LLC (LANS) (Ocean: LA-CC-13-047;
Copyright (c) 2013-2019, Los Alamos National Security, LLC (LANS) (Ocean: LA-CC-13-047;
Land Ice: LA-CC-13-117) and the University Corporation for Atmospheric Research (UCAR).

All rights reserved.
Expand Down
Loading