sort by:
Revision Author Date Message Commit Date
572be65 Merge branch 'jgfouca/fix_dndebug' into master (PR #6005) Fix NDEBUG cppdef The logic for adding it accidentally got inverted by an earlier PR. [BFB] 18 October 2023, 21:09:38 UTC
5811e29 Fix NDEBUG cppdef The logic for adding it accidently got inverted by an earlier PR. [BFB] 18 October 2023, 21:03:33 UTC
17e6feb Merge branch 'dqwu/machinefiles/adios-upgrade-cleanup' into master (PR #5988) Cleanup ADIOS2_ROOT for some E3SM machines So far, we will only test the new ADIOS IO type on the following machines: Perlmutter, Frontier, Summit, and ANL GCE workstations. Additionally, the ADIOS2 library has been upgraded from version 2.8.3 to 2.9.1 on these machines. Existing ADIOS2_ROOT configurations have been removed on specific machines, including Chrysalis, Anvil, Bebop, and Compy. [BFB] 18 October 2023, 19:11:49 UTC
6817fd9 Merge branch 'jgfouca/more_cmake_cleanup' into master (PR #5990) Changes: * Remove hdf5 stuff from the macros. FindNETCDF should take care of this stuff * Remove ESMF stuff that we don't use * Clean up some MPI stuff that was unused or had no effect on the build * gptl is now being handled properly in the new style With this PR, I think all of our main dependencies are in a good enough state as far as cmake is concerned. [BFB] * jgfouca/more_cmake_cleanup: Clean up remaining cmake deps 18 October 2023, 19:10:52 UTC
b25e37f Merge branch 'xylar/machinefiles/update-chicoma-cpu' (PR #5986) Update modules for chicoma-cpu Several modules are no longer available after a recent machine upgrade. [BFB] 18 October 2023, 19:04:38 UTC
f703513 Merge branch 'darincomeau/ice/add-cice-qc-testing' (PR #5969) Add CICE-QC testing script Adds a script to perform "CICE-QC" test, which determines if non-BFB changes in the sea ice model are climate-changing. This has been adapted from the CICE implementation for MPAS-Seaice. Documentation on usage is provided in a README.md alongside test script. [BFB] 18 October 2023, 18:59:30 UTC
f963238 Merge branch E3SM-Project/ndk/machinefiles/pm-cpu-remove-pelayout-workaround (PR #5971) For pm-cpu/alvarez, adjust pelayouts to remove performance work-around with CPL_PSTRID after maintenance 17 October 2023, 16:11:09 UTC
2236937 Merge branch 'azamat/sunspot/update-oneapi-20230515007' (PR #5881) Update Sunspot's OneAPI compiler to 2023.05.15.007 . Also, - add netcdf libs to LD_LIBRARY_PATH after recent CMake updates - rearrange modules by loading defaults after module purge - clean up cmake Fixes E3SM-Project/E3SM#5707 [BFB] 16 October 2023, 19:04:55 UTC
db2cac0 Update Depends file Update Depends file - don't need `-fc=ifort` any more, newer ifx can build 50K+ line sources - move OpenMP-offload to GPU-enabled CIME compiler 14 October 2023, 01:38:46 UTC
d61fb8e Update and remove ADIOS2_ROOT for some E3SM machines To facilitate testing of the ADIOS IO type, ADIOS2_ROOT is now configured on the following machines: Perlmutter, Frontier, Summit, and ANL GCE workstations. Additionally, the ADIOS2 library has been upgraded from version 2.8.3 to 2.9.1 on these machines. Existing ADIOS2_ROOT configurations have been removed on specific machines, including Chrysalis, Anvil, Bebop, and Compy. 14 October 2023, 00:07:00 UTC
0fd8844 Merge branch 'jayeshkrishna/externals/scorpio_1_4_2' (PR #5991) Upgrading SCORPIO from 1.4.1 to 1.4.2 SCORPIO v1.4.2 release includes the following fixes over v1.4.1, * Performance tuning (file striping settings) for Frontier * ADIOS performance improvements and fixes [BFB] 13 October 2023, 23:15:45 UTC
f6f7b13 Merge branch 'azamat/machines/add-gnu-invalid-check' (PR #5808) Add check for invalid fp-ops for GNU in debug mode. Also, fix ncol/pcol indexes in 2 eam-chemistry subroutines (flagged by `-ffpe-trap=invalid`). [non-BFB] - in fully-coupled tests 13 October 2023, 23:07:04 UTC
cff4226 Merge branch 'jgfouca/pm_cpu_gnu_lapack_blas' into master (PR #5998) pm-cpu/gnu use Generic blas/lapack Not the 'implicitly linked' ones. This fixes DIFFs. 13 October 2023, 22:36:47 UTC
396bcb4 pm-cpu/gnu use Generic blas/lapack Not the 'implicitly linked' ones. This fixes DIFFs. 13 October 2023, 22:34:47 UTC
95a13d9 Merge branch 'jgfouca/ascent_summit_blas' into master (PR #5995) Fix blas/lapack on ascent/summit Tell cmake to use Generic so it doesn't think ESSL is sufficient. [BFB] 13 October 2023, 22:07:11 UTC
9e6d115 Fix blas/lapack on ascent/summit Tell cmake to use Generic so it doesn't think ESSL is sufficient. [BFB] 13 October 2023, 21:16:17 UTC
97e527f Merge branch 'azamat/anvil/update-e3sm-prod-PEs' (PR #5987) Update Anvil config to fix OOM and link errors - Fix csm_share link errors - Update Anvil cmake 3.20.3->3.26.3 - Update Anvil e3sm_prod PEs to avoid OOM errors [BFB] 13 October 2023, 20:50:36 UTC
235a851 Merge branch 'yunpengshan2014/E3SM/P3SedimenttaionFluxChange' (PR #5891) Fix the calculations of p3 sedimentation fluxes Original calculation in the P3 code: the precipitation (rain and snow) flux (sflx for snow ) is summed over the flux at each sub-timestep during one microphysics timestep: sflx=flux_qit_1+ flux_qit_2+ flux_qit_3+… flux_qit_n, where the flux_qit_i (i=1,2,3,…n) represents the snow flux at each sub-timestep for sedimentation. This should not be correct. The correct flux should be the mean value for each microphysics timestep. Changed calculation in the current version: In E3SM-P3, since the sub-timestep is not a fixed value, the mean flux over the microphysics timestep should be calculated with: sflx=(flux_qit_1dt1+ flux_qit_2dt2+ flux_qit_3dt3+… flux_qit_ndtn)/( dt1+ dt2+ dt3+… dtn), where dti represents sub-timestep length. This is similar to the equation used to calculate the surface precipitation rate. This PR does not effect the model simulation results, but only change the diagnostic precipitation flux output. [BFB] for simulation results, COSP output affected. 13 October 2023, 20:44:54 UTC
d98c4fc Merge branch 'wlin/atm/ssp_tentativefix' (PR #5965) Implemented a tentative fix for SSP tests Future scenario forcing files for new species introduced by v3atm are not ready. The cime SSP tests using default v3 configuration therefore failed to be created. The tentative fix uses config that mixes v3 physics with v2 chemistry. Also fixed a couple misuses of eqv operator in linoz-related code that do not properly consider the precedence relative to AND/OR operators. The misuses have no impact on default v3 configuration, but would cause fatal runtime error when using the hybrid configuration as implemented here. [BFB] for existing tests. 13 October 2023, 20:42:58 UTC
495ba1d Merge branch 'jgfouca/fix_pm_intel_blas' into master (PR #5993) Fix MKL linking on pm-cpu_intel Need to tell cmake to use Intel vendor for blas. [BFB] 13 October 2023, 18:22:39 UTC
a063972 Fix MKL linking on pm-cpu_intel Need to tell cmake to use Intel vendor for blas. [BFB] 13 October 2023, 16:19:59 UTC
3f78dfa Add netcdf libs to LD_LIBRARY_PATH after recent CMake updates Also rearrange modules by loading defaults after module purge and clean up cmake. 13 October 2023, 00:31:18 UTC
2a93b58 Update Sunspot's OneAPI compiler to 2023.05.15.007 12 October 2023, 22:28:04 UTC
0dfc07f Update Anvil e3sm_prod PEs for in test-PEs Also remove `-mkl` from link line after CMake BLAS updates 12 October 2023, 21:40:59 UTC
ed32fda Upgrading SCORPIO to 1.4.2 Upgrading SCORPIO from 1.4.1 to 1.4.2 SCORPIO v1.4.2 release includes the following fixes over v1.4.1, * Performance tuning (file striping settings) for Frontier * ADIOS performance improvements and fixes 12 October 2023, 18:33:47 UTC
6223567 Merge remote-tracking branch 'origin/master' into jgfouca/more_cmake_cleanup * origin/master: (325 commits) Set mappy to use generic blas blas/lapack settings should not depend on mpilib Refactor blas and lapack stuff a bit more revert fix for gravity wave convective heating Add back in kokkos options Revert to master version of gnugpu_pm-gpu.cmake add Kokkos_ENABLE_OPENMP=Off for gnugpu on pm-gpu add Kokkos_ENABLE_OPENMP=Off for gnugpu on Frontier add Kokkos_ENABLE_OPENMP=Off for Summit remove configure support for MMF m2005 microphysics configure clean up and remove samomp support add new lines re-enable CRM variance and momentum transport for MMF1 add new line at end of pam_debug update default PAM time step update PAM submodule disable kokkos finalize in PAM driver add hyperdiffusion to PAM and refactor PAM driver update pam_statistics refactor pam_output ... 12 October 2023, 17:34:49 UTC
14d8fa1 Merge branch 'jgfouca/cmake_blas_lapack' into master (PR #5972) Convert blas/lapack/mkl to new cmake style This was a more challenging task than I thought it would. FindBLAS / FindLAPACK are built in to cmake and can also handle MKL stuff via the BLA_VENDOR setting (if you set it to Intel... you get various flavors of MKL). The find_package for blas/lapack is pretty smart and should do the right thing most of the time. Machine POCs should refine the settings on their machines using https://cmake.org/cmake/help/latest/module/FindBLAS.html#blas-lapack-vendors as as guide. I suspect many of these cache files were copy/pasted without a ton of consideration. As an example, pm-cpu_nvidia is one platform where you will get DIFFs if you don't use the right blas/lapack. To set this up, I added the following to the environment block for that machine/compiler combo: <environment_variables compiler="nvidia"> <env name="BLAS_ROOT">$SHELL{if [ -z "$BLAS_ROOT" ]; then echo /opt/nvidia/hpc_sdk/Linux_x86_64/22.7/compilers; else echo "$BLAS_ROOT"; fi}</env> <env name="LAPACK_ROOT">$SHELL{if [ -z "$LAPACK_ROOT" ]; then echo /opt/nvidia/hpc_sdk/Linux_x86_64/22.7/compilers; else echo "$LAPACK_ROOT"; fi}</env> <env name="BLA_VENDOR">NVHPC</env> </environment_variables> The documentation indicates that the find modules for blas may be smart enough to auto detect the bla_vendor: BLA_VENDOR Set to one of the [BLAS/LAPACK Vendors] to search for BLAS only from the specified vendor. If not set, all vendors are considered. Once again, I am impressed at how much clutter is removed when we do things t "right" (using find_package instead of packing stuff into SLIBS) way. [BFB] 12 October 2023, 17:13:48 UTC
bcd8798 Set mappy to use generic blas 12 October 2023, 17:04:16 UTC
26170af blas/lapack settings should not depend on mpilib 11 October 2023, 21:35:43 UTC
23e9e30 Refactor blas and lapack stuff a bit more Get rid of all the BLA_VENDOR stuff in the macros. It had no impact because deps are loading before macros are processed. We should prefer using the environment to set this stuff like we are doing for the other libs. pm-cpu_nvidia seems to be the one platform sensitive to lapack/blas so can be used as an example of how to specify these libraries. 11 October 2023, 21:30:20 UTC
613312c Update Anvil e3sm_prod PEs to avoid OOM errors. 11 October 2023, 20:52:14 UTC
048078f Update Anvil cmake 3.20.3->3.26.3 Also disable test archiving on Bebop and Anvil. 11 October 2023, 20:46:46 UTC
9525073 Fix csm_share link errors Link to MKL single dynamic library with `-mkl` to avoid undefined references to Intel's vector math routines vdsqrt, vdexp and others in csm_share. 11 October 2023, 20:36:07 UTC
99a3acc Update intel cmake macros for chicoma 11 October 2023, 18:09:29 UTC
c18e11b Update modules for chicoma-cpu 11 October 2023, 18:01:35 UTC
8a14ed5 Fix trailing whitespace 11 October 2023, 18:01:35 UTC
a093fa2 Clean up remaining cmake deps 10 October 2023, 20:29:20 UTC
732e699 Merge branch 'whannah/mmf/pam-impl' (#5906) ntegration of new CRM for MMF, referred to as the "portable atmosphere model" or PAM, that uses the P3 and SHOC physics implementation from SCREAM/EAMxx. The new CRM is used by the compsets with "MMF2" in their name. While the PAM code is isolated to a submodule, several large changes outside were required to facilitate this integration. The PAM interface code is a substantial part of this, but there was also new conflicts created by EAMv3 integration efforts which led to the creation of various "dummy" modules to avoid building the conflicting modules, which are unnecessary for MMF. A new integration is added to test the new CRM => SMS_Ln3.ne4pg2_ne4pg2.F2010-MMF2 A few things to note about the current MMF2 implementation - When running with PAM on the GPU the use of openMP threads is problematic for reasons that are unclear. This seems fixable, but more work is needed to look into this. For now, running on GPUs without OMP threads is sufficient, and CPU cases are not affected by this problem - Although some offline PAM tests have used longer time steps, when running within the MMF configuration at ne30 the PAM time step needs to be 4 seconds for stability. A lot of performance can be gained by increasing this time step, but more work is needed to understand the source of the instability. - PAM performance also seems highly machine dependent. For example, using 22 nodes on Perlmutter runs 6x faster than 64 nodes on Summit for the same case. [BFB] 10 October 2023, 20:00:05 UTC
9b40b2d Merge remote-tracking branch 'origin/master' into jgfouca/cmake_blas_lapack * origin/master: Fix nvidia_pm-cpu diffs for some tests Fix PIO dep on mpi-serial add ghp preview 10 October 2023, 16:48:35 UTC
e195c80 Merge branch 'jgfouca/fix_nvidia_pm_cpu_diffs' into master (PR #5976) Fix nvidia_pm-cpu diffs for some tests Be explicit about which hdf5 and blas/lapack libraries to link so that later -L options don't mess things up. Also, make some minor enhancements to the compare-flags tool in order to get more useful output when comparing unordered flags. [BFB] 10 October 2023, 16:43:27 UTC
85addcc Merge branch 'jgfouca/fix_mpi_serial_link' into master (PR #5975) Fix PIO dep on mpi-serial PIO needs to depend on mpi-serial in order for the link order to be correct. [BFB] 10 October 2023, 16:40:57 UTC
ddf0c37 revert fix for gravity wave convective heating 09 October 2023, 22:12:30 UTC
c4e81db Fix nvidia_pm-cpu diffs for some tests Be explicit about which hdf5 and blas/lapack libraries to link so that later -L options don't mess things up. Also, make some minor enhancements to the compare-flags tool in order to get more useful output when comparing unordered flags. [BFB] 09 October 2023, 21:20:18 UTC
05cbb2e Fix PIO dep on mpi-serial PIO needs to depend on mpi-serial in order for the link order to be correct. [BFB] 09 October 2023, 21:13:54 UTC
2f2639c Add back in kokkos options 09 October 2023, 18:50:54 UTC
b39578d Revert to master version of gnugpu_pm-gpu.cmake 09 October 2023, 18:49:53 UTC
4d82d99 Update minimum cmake 09 October 2023, 18:31:40 UTC
589f08c Merge branch 'mahf708/docs/improve-gh-pages-docs' (PR #5951) Adds docs preview to PR page. Preview appears in a comment. This workflow will update the same comment if there are changes (it won't pollute the PR page with more comments). Additionally, I spaced out the GitHub action so that it is easier to read and maintain (and shortened the names) [BFB] 09 October 2023, 18:07:34 UTC
d936aee use updated container with singularity 08 October 2023, 23:17:48 UTC
06a9bb2 add Kokkos_ENABLE_OPENMP=Off for gnugpu on pm-gpu 05 October 2023, 20:10:00 UTC
0b00cbe add Kokkos_ENABLE_OPENMP=Off for gnugpu on Frontier 05 October 2023, 20:07:52 UTC
9f6e496 Convert blas/lapack/mkl to new cmake style 05 October 2023, 19:24:37 UTC
11385cc add Kokkos_ENABLE_OPENMP=Off for Summit 05 October 2023, 17:52:59 UTC
2ff3742 Merge branch 'jgfouca/cmake_mct_csm_share' into master (PR #5964) CMake: Improve dependency management for mct and csm_share Neither of these packages are cmake packages, so we have to roll our own Find$package.cmake modules. These can be pretty simple for e3sm since we build them ourselves (no worries about version or not found etc). Also, remove a lot of unused for special handling of clm and stuff for pio building. [BFB] 05 October 2023, 17:46:26 UTC
a88c772 remove configure support for MMF m2005 microphysics 05 October 2023, 15:21:53 UTC
dcf047d configure clean up and remove samomp support 05 October 2023, 15:13:23 UTC
388011d add new lines 05 October 2023, 15:05:20 UTC
33f6261 re-enable CRM variance and momentum transport for MMF1 04 October 2023, 23:03:11 UTC
96d93d5 add new line at end of pam_debug 04 October 2023, 22:57:58 UTC
4ef07e2 update default PAM time step 04 October 2023, 22:52:48 UTC
3cc85e2 update PAM submodule 04 October 2023, 20:24:00 UTC
573137b Merge branch E3SM-Project/ndk/machinefiles/alvarez-update (PR #5966) For alvarez (internal test machine for pm-cpu), update machine file settings 04 October 2023, 19:50:10 UTC
0410ff3 for pm-cpu/alvarez, remove work-around to use CPL_PSTRID=8 after pm-cpu maintenance 04 October 2023, 19:38:43 UTC
cb05869 disable kokkos finalize in PAM driver 04 October 2023, 19:15:57 UTC
653b97b Fixes frontier netcdf handling 04 October 2023, 18:51:50 UTC
50b3694 For now, make rrtmgp depend on spio instead of netcdf This will ensure correct link order 04 October 2023, 16:38:15 UTC
12fa227 Adding CICE-QC testing script and documentation 03 October 2023, 22:59:48 UTC
f1a646a add hyperdiffusion to PAM and refactor PAM driver 03 October 2023, 22:24:49 UTC
66a7723 update pam_statistics 03 October 2023, 20:50:22 UTC
4e92e09 refactor pam_output 03 October 2023, 20:49:52 UTC
b7a78cb Progress on refactored netcdf handling 03 October 2023, 18:47:33 UTC
eddad77 Attempting to improve netcdf situation 03 October 2023, 16:59:02 UTC
a88ffb4 clean-up pam_state 03 October 2023, 15:37:39 UTC
fe64ea0 Workaround adios2 find cmake problem 02 October 2023, 20:44:36 UTC
34f2eec Fix a couple more adios things 02 October 2023, 19:59:55 UTC
db34761 Another syntax fix 02 October 2023, 17:41:34 UTC
a514f98 Fix paren 02 October 2023, 17:36:29 UTC
c92837c Only find adios if ADIOS2_ROOT is set 02 October 2023, 17:30:26 UTC
a5177a0 Fix adios stuff in FindPIO 02 October 2023, 17:28:18 UTC
7075e9a Better handling of adios2 02 October 2023, 16:55:23 UTC
1f42fb8 machine file changes for alvarez (internal test system for pm-cpu) 30 September 2023, 17:30:46 UTC
cb0e833 add ghp preview 29 September 2023, 22:26:38 UTC
8ab1f1d Make mpas depend on spio instead of just netcdf This ensures correct link order 29 September 2023, 17:23:49 UTC
293a797 Better way of handling the spio->netcdf dependency 29 September 2023, 16:16:04 UTC
3fcd94e Guard all Find modules from repetition so users don't have to Fix mpas netcdf dep, should be public 28 September 2023, 22:06:58 UTC
1de6606 Remove pnetcdf cppdef 28 September 2023, 20:45:01 UTC
89f28a0 More netcdf fixes. Mpas was using old approach 28 September 2023, 20:39:07 UTC
ab75f35 Fix for rrtmgp netcdf dep 28 September 2023, 20:28:33 UTC
ce46a5f Use SSP specific pattern match and fix use of eqv operator with or/and 28 September 2023, 20:24:52 UTC
3a78f4d Ensure netcdf dep is in the right order 28 September 2023, 19:40:43 UTC
360bf8a Remove unused MCT_INTERFACE cppdef 28 September 2023, 16:33:31 UTC
ac40a2c Some minor fixes. Add find MCT to find module for csm_share 28 September 2023, 16:24:26 UTC
fbdfc20 Fixes 27 September 2023, 22:31:10 UTC
f2786de Add modules 27 September 2023, 21:46:13 UTC
cf3c1a8 CMake: improve dep on mct and csm_share 27 September 2023, 21:40:32 UTC
894b5b2 Merge branch 'xylar/mpas-ocean/fix-parabolic-bowl-registry' (PR #5930) Fix parabolic bowl registry for MPAS-Ocean init mode There were a few syntax issues with the MPAS-Ocean registry for the parabolic bowl test case that prevent it from being parsed correctly in Polaris. They are fixed here. Not used in E3SM. [BFB] 27 September 2023, 17:55:59 UTC
614d911 Merge branch 'jgfouca/cmake_petsc' into master (PR #5959) Cleanup petsc cmake stuff Also remove a lot of unused stuff. [BFB] * jgfouca/cmake_petsc: Cleanup petsc cmake stuff 27 September 2023, 15:40:57 UTC
67b20d1 Cleanup petsc cmake stuff [BFB] 26 September 2023, 21:15:48 UTC
f2dc02e Merge branch 'xylar/mpas-ocean/accumulate-data-land-ice-fluxes' (PR #5910) Accumulate data land-ice mass fluxes Before this merge, we were only accumulating this flux in prognostic flux mode. With this merge, we accumulate the mass flux in data mode as well, as this term is needed in the total mass budget of the model. To facilitate this and reduce issues related to initialization vs. forward time stepping, this accumulation step has been broken into its own subroutine, ocn_surface_land_ice_fluxes_accumulate_fluxes(). This subroutine is called when time-stepping the model but not at initialization (since we do not want to accumulate any fluxes at that time). Fixes #5911 [BFB] 26 September 2023, 18:52:27 UTC
ffc0e2b Merge branch 'jgfouca/cmake_albany' into next (PR #5950) CMake: Improve handling of Albany and related packages Specifically: * Albany * Trilinos * Kokkos This PR establishes the new paradigm of setting ${Package}_ROOT to find the packages we need. So far, I am very happy with how this is going. You can see how much cleaner it is to do things the CMake-3 so you don't have to micro-manage flags. In order to be consistent, changes kokkos override env var from KOKKOS_PATH to Kokkos_ROOT. Fixes #5786 [BFB] * jgfouca/cmake_albany: Remove obsolete references to ALBANY_PATH in cmake macros Improve Kokkos handling CMake: Improve handling of Albany and related packages 26 September 2023, 16:22:45 UTC
back to top