https://github.com/E3SM-Project/E3SM

sort by:
Revision Author Date Message Commit Date
61c400d Fixed GNU build issue by overloading '=' for nan 29 June 2021, 23:22:46 UTC
4963107 Changed erf and NaN initialization in DUSTMod to fix non-BFB behavior on chrysalis 29 June 2021, 18:47:41 UTC
b80aaa4 resolved conflicts for merge. [BFB] 28 June 2021, 02:57:37 UTC
882ed5f Fix conflicts with new flux additions Tested e3sm_land_developer on cori-knl intel [BFB] 27 June 2021, 20:41:33 UTC
5f69ce8 Rebased to fix merge conflicts. Performed baseline comparisons on cori-knl w/ intel compiler. [BFB] 27 June 2021, 20:41:33 UTC
37b1ac6 Adjusted dyn_cnbal_patch variables to use filter 27 June 2021, 20:41:33 UTC
91ba11f Rebased to resolve merge conflicts, adjust timer names, and other code clean up. Compared baselines for e3sm_land_developer with cori-knl and intel. [BFB] 27 June 2021, 20:41:33 UTC
064a681 Further clean up after rebase and got rid of dynUpdateModAcc.F90 which required making the dynPatch/Column stater updater routines no longer bound to the types. Possibly compiler bug with the optional arguments. fix compiler issues with intel on cori Corrected initialization of data-types to be NaN as they were previously fix AllocationMod all e3sm_land_developer tests are [BFB] and all e3sm_developer tests pass Fixed timing error for fireinterp. Replaced timing calls with tstartGPU/tstopGPU and removed type bound syntax in EcosystemDynMod. Fixed error in histGPUMod. e3sm_land_developer tests still [BFB] for cori-knl intel. fix GNU compiler issues Addressed many review comments deleting commented lines, reverting some changes. Deleted unnecessary code, fixed timing and dynConsbiogeophys issues 27 June 2021, 20:41:30 UTC
b9c8d96 Rest of EcosystemDyn -- reverted a couple of non-BFB optimizations for now. Modified VegetationDataType to prepare for getting rid of Methods_procs_acc.F90 27 June 2021, 20:19:23 UTC
3c94b55 Changes to most of EcosystemDyn Routines and changed calls to timer rouintes. 27 June 2021, 20:19:23 UTC
4b20081 Adjusted remaining routines used outside of EcosystemDynMod 27 June 2021, 20:19:21 UTC
5054e17 fix summary routines and dynInitColumns and preprocesser flags 27 June 2021, 20:14:09 UTC
227bc6f [BFB] For all routines I have been removing waterflux_vars, waterstate_vars, etc... since they are not used in ELM in general. They are still used in subroutine arguments to BeTR and FATES though, so I have use associated them at the top of modules where needed. Otherwise, These variables would just waste GPU memory. For CanopyFluxes, I moved the perchroot and perchroot_alt namelist variables to CanopyStateType.F90. This means that CanopyFluxesMod.F90 can successfully use elm_instMod without creating a circular dependency (elm_instMod depends on controlMod which needed CanopyFluxesMod). There are other possible solutions. fixed mistaken replacement of soilordercontype.f90 fixed some preprocessor flags 27 June 2021, 20:14:09 UTC
d55eb69 Added openacc routine flags and declaration statements needed for some of the subroutines in biogeophys. Created to timing module so that timing parameters can easily be accessed as global variables rather than attempting to add OpenACC flags to the ESMF timing modules. SimpleMathMod now contains an openacc accelerated Matvec multiply routine -- currently only sequential which may change based on the parallelism available in PhotosynthesisMod 27 June 2021, 20:14:06 UTC
78d0b91 adjusted biogeophys derived types for compatibility with deepcopy to gpu. 27 June 2021, 20:10:30 UTC
3e75799 adjustments to subroutine args 27 June 2021, 20:10:30 UTC
90b6e04 main/dynUpdateModAcc.F90 is a module that contains method procedures of the dyn_subgrid derived types similar to Method_procs_acc.F90 27 June 2021, 20:10:30 UTC
ae9f8e6 main/subgridAveMod.F90 : added gpu version of existing routines that can be used via interfaces. The character arguments changed to integers. Created lookup routines create_scale_c2l that mirrors create_scale_l2g. dyn_subgrid: created gpu routines for dyn_subgrid module. Made major changes to dynConsBiogeochemMod.F90 and dynSubgridAdjustmentsMod.F90 so that the patch adjustments are paralyzed at the patch level. 27 June 2021, 20:10:30 UTC
211ae6e Modified data types to use only pointers. Otherwise, OpenACC deepcopy will not properly transfer to GPU. Added new (possibly temporary) module Methods_procs_acc that contains the class procedures of data types that are callled from gpu compute regions. Also, adjusted the procedures to use associate clauses to compensate for OpenACC's restrictions of passing array slices of derived types to in subroutine calls. 27 June 2021, 20:10:25 UTC
d28e877 Merge branch 'bishtgautam/lnd/cnp-budget' (PR #3986) Adds global carbon budget in the ELM. [BFB] 25 June 2021, 16:36:38 UTC
d341612 Merge branch 'vanroekel/mpas-ocean/update-moc-basin-files' (PR #4355) Updates basin definitions for MOC calculation Updates the Atlantic basin to exclude the Mediterranean sea and adds a new AtlanticMed region that includes it. The default MOC calculation will now not include the Mediterranean Sea. This affects current v2 production meshes only: * EC30to60E2r2 * ECwISC30to60E2r1 * SOwISC12to60E2r4 * WC14to60E2r3 This PR only influences analysis calculations in MPAS-Ocean and should thus be BFB. [BFB] 24 June 2021, 16:53:14 UTC
f774b21 Merge branch 'jgfouca/cime_sub_update_2021_06_22' into master (PR #4350) ... to 19c689b3a8a554f9892862a323ee140e41a794f0 Changes: 1) Adds --chksum argument to case.submit and create_test allowing users to verify checksums without explicitly calling check_input_data 2) support the GLC component having multiple grids (e.g., Greenland & Antarctica), but the implementation handles any component having multiple grids 3) Record preview_run output in provenance 4) Compells all CIME CCS scripts to use python3! Fixes: 1) updates the three E3SM climate reproducibility tests (MVK, PGN, and TSC) to work with updated component names (eam and elm) and time step namelist variables. 2) Fixes unittest raising error on py37, os.path.basename needed to be mocked. 3) Fixes error in parsing and comparing namelist values in the form of "(scale * data path)" 4) Fixes only calling custom_success_msg function when there is a return value from run_and_log_case_status. Adds warnings when walltime is outside of min/max for the selected queue. 5) Change cdash upload settings: Use https instead of http but dont do verification. This seems to be the most robust approach. Previous CIME changes removed official support for python2, but a fair number of scripts continued to have '#!/usr/bin/env python ' at their top which potentially allowed python2 to be used depending on the machine's environment. All scripts have been changed to force python3 to be used. I've also changed all the scripts living in E3SM to do this as well. This should help us avoid mixing pythons when doing our work. [BFB] * jgfouca/cime_sub_update_2021_06_22: Update CIME submodule 24 June 2021, 16:08:06 UTC
db6051a Updates the arguments for few subroutines - Removes unused input arguments - Adds input arguments that are used and removes variables that are globally included 24 June 2021, 15:11:46 UTC
5f6f622 Renames subroutines for N and P 24 June 2021, 14:45:05 UTC
bdb27a3 Removes a subroutine to begin C balance `BeginGridCBalanceBeforeDynSubgridDriver` is removed and the functionality is now added in `BeginGridCBalance` 24 June 2021, 14:28:22 UTC
33d438d Merge branch 'rgknox/lnd/fates-bgc-bugfixes' (PR #4157) These are bug fixes for bgc coupling of fates. FATES is now instantiated only on active columns, which is consistent with the soil column filter upon which CNP biogeochemistry is active. Also, a litter flux was zero'd upon allocation which is critical for mass balance checks when FATES is active. Finally, the FATES submodule pointer is updated to its most recent tag: sci.1.43.3_api.14.2.0 Fixes: #4186 [non-BFB] for only FATES 24 June 2021, 13:41:50 UTC
21a1cb4 Updates basin definitions for MOC calculation Updates the Atlantic basin to exclude the Mediterranean sea and adds a new AtlanticMed region that includes it. The default MOC calculation will now not include the Mediterranean Sea. This affects current v2 production meshes only * EC30to60E2r2 * ECwISC30to60E2r1 * SOwISC12to60E2r4 * WC14to60E2r3 23 June 2021, 14:01:02 UTC
fec9da4 Updating fates pointer to sci.1.45.2_api.15.0.0_patchA 22 June 2021, 17:13:58 UTC
32c44f3 Merge remote-tracking branch 'ckovenfork/ckoven/lnd/fates_snow_occlusion' (PR #4216) These changes allow FATES to consider snow occlusion of LAI. This accompanies NGEET/fates#734 and fixes NGEET/fates#359. Should be non-bit-for-bit only in FATES simulations. 22 June 2021, 16:05:07 UTC
42f05a7 Update CIME submodule ... to 19c689b3a8a554f9892862a323ee140e41a794f0 Changes: 1) Adds --chksum argument to case.submit and create_test allowing users to verify checksums without explicitly calling check_input_data 2) support the GLC component having multiple grids (e.g., Greenland & Antarctica), but the implementation handles any component having multiple grids 3) Record preview_run output in provenance 4) Compells all CIME CCS scripts to use python3! Fixes: 1) updates the three E3SM climate reproducibility tests (MVK, PGN, and TSC) to work with updated component names (eam and elm) and time step namelist variables. 2) Fixes unittest raising error on py37, os.path.basename needed to be mocked. 3) Fixes error in parsing and comparing namelist values in the form of "(scale * data path)" 4) Fixes only calling custom_success_msg function when there is a return value from run_and_log_case_status. Adds warnings when walltime is outside of min/max for the selected queue. 5) Change cdash upload settings: Use https instead of http but dont do verification. This seems to be the most robust approach. Previous CIME changes removed official support for python2, but a fair number of scripts continued to have '#!/usr/bin/env python ' at their top which potentially allowed python2 to be used depending on the machine's environment. All scripts have been changed to force python3 to be used. I've also changed all the scripts living in E3SM to do this as well. This should help us avoid mixing pythons when doing our work. [BFB] 22 June 2021, 15:38:20 UTC
ec03cdd Merge branch 'whannah/mmf/split-tphysbc' (#4333) This splits the tphysbc() routine into 2 separate routines that can be called in separate threaded chunk loops while calling the CRM in between without threading. The mmf_clear_rh variable is converted to a pbuf variable to avoiding passing it around in phys_run1(). I also included some clean up of physpkg.F90 since there were several unnecessary variables and use statements. This change allows more flexibility for tuning performance on GPU machines, but will require another PR to refactor crm_physics.F90 and push the chunk loop down into crm_physics_tend() so that all CRMs in a given MPI task can be solved in parallel. [BFB] 18 June 2021, 18:26:15 UTC
1f3306a Merge branch 'mattdturner/ocean/diagnostics_gpu_port' (PR #4346) Port ocean diagnostics to GPU w/ OpenACC This PR is the first phase of porting the ocean diagnostics code to GPUs using OpenACC. It contains a subset of the necessary changes for running on the GPU that retain bit-for-bit accuracy with the current version when running on the CPU. [BFB] 18 June 2021, 14:29:36 UTC
84079b8 updated fates to sci.1.45.2_api.15.0.0_patchA 17 June 2021, 19:21:11 UTC
ab1794e Updating FATES submodule pointer to tag sci.1.44.1_api.14.2.0_patchA. This patch enables b4b restarts on fates tests 17 June 2021, 16:35:56 UTC
ddbfed3 Removing some commented out fates interface code, cleanup 17 June 2021, 16:33:52 UTC
5e46d6d Correct errors in mesh file that were introduced by the merge 17 June 2021, 15:25:36 UTC
7774c1a Revert Makefile changes 17 June 2021, 15:08:30 UTC
f8ef2b5 Remove more unnecessary stuff 16 June 2021, 21:21:54 UTC
d2e3616 Remove unnecessary logicals 16 June 2021, 21:18:46 UTC
e58c747 Add comment 16 June 2021, 21:16:21 UTC
0be335e fix typo 16 June 2021, 20:58:49 UTC
68e9119 delete commented code modified: components/eam/src/physics/crm/physpkg.F90 16 June 2021, 20:58:33 UTC
ca827d9 Merge branch 'brhillman/mmf/update-samxx-fft' (#4191) Update SAMXX code to work with the new FFT interface in the latest YAKL. Also updates YAKL to the latest version, which is needed for the RRTMGPXX port. The new FFT calculation is non-BFB, but differences appear to be near machine precision. Also fixes the SAMXX standalone driver to work with changes implemented in #4301. [non-BFB] (only for F-MMFXX test) 16 June 2021, 18:59:30 UTC
943ece8 Updating fates pointer again, strange submodule conflict with 516c184 16 June 2021, 16:49:15 UTC
687a3d6 Updating fates pointer to most recent hash 16 June 2021, 16:42:53 UTC
5667c85 Modified write statement on fates parameters to only be in debug mode 16 June 2021, 16:42:52 UTC
640e7f3 Minor syntax updates in FATES, updated machine files for lawrencium, update submodule pointer to FATES sci.1.43.3_api.14.2.0 16 June 2021, 16:42:52 UTC
085f062 Updates to fates active columns and initializing fluxes 16 June 2021, 16:41:58 UTC
2632b2a Merge branch 'proteanplanet/ice/cons-am-fix' (PR #4345) Fix restart and area bug in MPAS-SI Conservation Analysis Member This corrects a problem in the MPAS-SeaIce Conservation Analysis member configuration whereby the first month of history after a restart of E3SM was dropped from the analysis history. It also corrects another problem in that the mean monthly area of sea ice on the mesh was not being reset or averaged correctly. [NML] [BFB] 16 June 2021, 15:07:53 UTC
8b31f88 Merge branch 'azamat/jlse/add-intel19-libs' (PR #4339) Update JLSE machine config: - add iris, yarrow, arcticus queues - build with oneapi ifx (default) and ifort compilers - add OpenMP-offload flags for Intel GPUs [BFB] 15 June 2021, 22:35:13 UTC
3a2a7fd Fixes to standalone drivers to work with MMF derived type mods 15 June 2021, 18:13:43 UTC
f6b55c3 Trim whitespace when comparing strings 15 June 2021, 18:13:43 UTC
bb863b1 More fixes for standalone 15 June 2021, 18:13:43 UTC
fb0d919 Remove phys_getopts from all crm modules to play nice with standalone 15 June 2021, 18:13:43 UTC
2bbc4b0 Remove physopts from crm_input_module to be friendly to standalone code 15 June 2021, 18:13:43 UTC
81022b3 Update to latest YAKL 15 June 2021, 18:13:43 UTC
d539af9 Add ifdef guards around call to gator_finalize 15 June 2021, 18:13:43 UTC
c0c35b9 Add a crm_physics_final to clean up 15 June 2021, 18:13:43 UTC
1d537fa Fixes to work with new FFT class 15 June 2021, 18:13:42 UTC
c3d6ed2 Update YAKL 15 June 2021, 18:13:42 UTC
4a77470 Merge branch 'jonbob/tests/fix-extrasnowlayers' (PR #4337) Fix extrasnowlayers test, using corrected compset and updated name Fixes a mis-named test in the e3sm_ocnice_extra_coverage suite, which had an incorrect compset and was using "clm" instead of "elm" for the testmod. [BFB] 15 June 2021, 17:09:39 UTC
f1d495d Add no compute on restart and fix area in conservation AM 14 June 2021, 17:15:54 UTC
d6ddb3e Merge branch 'jgfouca/cime/update_sandia_proxies' into master (PR #4340) Hotfix: proxy update for sandia machines [BFB] * jgfouca/cime/update_sandia_proxies: Hotfix: proxy update for sandia machines 12 June 2021, 18:48:22 UTC
f7668c4 Hotfix: proxy update for sandia machines [BFB] 12 June 2021, 18:45:29 UTC
bc71cda Use --queue iris to run on Iris nodes Also enable yarrow and arcticus queues 12 June 2021, 01:01:22 UTC
e5ce936 Read/write from/to gpfs project dir 12 June 2021, 01:01:21 UTC
0cf30e7 Add files to be built with ifort to Depends.oneapi-ifx.cmake 12 June 2021, 01:01:21 UTC
64aa185 Export ONEAPI_OVERRIDE_KOKKOS=1 env-var in a custom e3sm module 12 June 2021, 01:01:20 UTC
c173b0b Reduce debug output with LIBOMPTARGET_DEBUG=0 12 June 2021, 01:01:19 UTC
31e53d7 Add oneapi-ifx compiler to JLSE machine 12 June 2021, 01:01:18 UTC
e4d974b Add RLIMIT_STACK unlimited to JLSE machine config 12 June 2021, 01:01:17 UTC
5f3fffc Add `-traceback` to OneAPI classic compiler 12 June 2021, 01:01:16 UTC
51116f2 Add OneAPI classic compiler 12 June 2021, 01:01:01 UTC
f35f6df Use aurora_mpich-built libs for intelgpu on jlse-iris 12 June 2021, 00:59:39 UTC
911d03b Reduce number of MPI tasks to number of cores on JLSE 12 June 2021, 00:59:38 UTC
b5d9c65 Add oneapi-classic libraries on JLSE 12 June 2021, 00:59:38 UTC
b239371 Add perl install on JLSE 12 June 2021, 00:59:37 UTC
c058b42 Add intel/2019 libraries on JLSE 12 June 2021, 00:59:36 UTC
4d66214 Merge branch 'quantheory/equilibrium-surface-fluxes'(PR #4229) Add options to affect surface stress and gustiness calculations This PR adds two options to env_run.xml that affect the calculation of surface stresses. Both options are off by default, and this PR should be a BFB change unless these options are activated. The first of these options is ATM_SUPPLIES_GUSTINESS, which causes the atmosphere to export a new field ugust to the coupler (and relevant surface components). This extra gustiness is then used in the calculation of the stress by the surface components. The second option added in this PR is ATM_FLUX_INTEGRATION_METHOD. The default is explicit, which uses the existing stress calculations. If this option is set to implicit_stress, an implicit method is used to calculate the surface stresses, which reduces the instability due to a coarse time step. This requires two additional fields to be exported from the coupler (wsresp and tau_est), which represent a linearization of the response of the boundary layer scheme to the surface stresses. This commit provides a partial solution to issue #4073. [BFB] * quantheory/equilibrium-surface-fluxes: Fix compilation error from pointer arguments for single precision CLUBB. Minor updates for implicit_stress option for UrbanFluxesMod. Fix issue with implicit_stress DEBUG runs on Intel. Add ATM_FLUX_INTEGRATION_METHOD/ATM_SUPPLIES_GUSTINESS tests. Comment/doc changes suggested by Walter Hannah. Add option to export gustiness from atmosphere. Add option for implicit surface flux calculations 11 June 2021, 16:30:15 UTC
0c0cc63 Merge branch 'philipwjones/ocn/gotm-path-fix' (PR #4331) Fix bad path for gotm in standalone ocean build This one line change fixes a bad path for the gotm library in ocean standalone builds. It does not impact E3SM configurations. Fixes #4330 [BFB] 11 June 2021, 15:05:31 UTC
11539d8 Fix extrasnowlayers test, using corrected compset and updated name 10 June 2021, 22:56:18 UTC
6ef6f6e Merge branch 'whannah/mmf/add-mmf-testmods' (#4329) Add new MMF test mods for variance transport and momentum transport options and rename "crmout" test mod for consistency. This also updates MMF integration tests to include the new test mods. [BFB] (except for 3 MMF tests) 10 June 2021, 20:42:45 UTC
6634793 Fix compilation error from pointer arguments for single precision CLUBB. 10 June 2021, 19:16:05 UTC
69351f2 Merge branch 'caozd999/ocean/fix_bottom_drag_coeff' (PR #4328) Fix a bug in computing bottom drag coefficient This fixes an obvious bug: in Manning equation: Cd = g * manningN**2 * water_depth**(-1/3). The original code missed a negative sign in the last parentheses of the equation. It alters a value for vegetation bottom drag, which is off for standard E3SM runs, so E3SM testing will remain bit-for-bit. Fixes #4332 [BFB] 10 June 2021, 14:50:10 UTC
dada8f5 remove extra space 10 June 2021, 10:19:15 UTC
274e91d switch sea ice streams file to append so data is not lost on restart *********1*********2*********3*********4*********5*********6*********7** Longer commit message body describing the commit. Can contain lists as follows: * Item 1 * Item 2 * Item 3 A good commit message should be written like an email, a subject followed by a blank line, followed by a more descriptive body. Can also contain a tag at the bottom describing what type of commit this is. [BFB] - Bit-For-Bit [FCC] - Flag Climate Changing [Non-BFB] - Non Bit-For-Bit [CC] - Climate Changing [NML] - Namelist Changing See confluence for a more detailed description about these tags. 09 June 2021, 22:51:19 UTC
7baf7e2 Minor updates for implicit_stress option for UrbanFluxesMod. This commit moves an implicit_stress check outside of a loop in UrbanFluxesMod so that the loop is skipped entirely if that option is off. This commit also fixes a typo in the initial setting of tau_diff that could slow convergence of tau iterations for the implicit stress method (in practice the previous value should still be large enough that this should rarely/never have a significant effect on results). 09 June 2021, 21:18:17 UTC
b60432a Add OpenACC directives for edgeSignOnCell in diagnostics 09 June 2021, 20:03:53 UTC
939a827 Update gotm submodule 09 June 2021, 16:20:09 UTC
7ed768d Simplify gotm in Makefile 09 June 2021, 16:19:35 UTC
68e4401 fixed bad path for gotm in standalone ocean build 09 June 2021, 16:19:12 UTC
b148c9a Update shell_commands 09 June 2021, 15:19:09 UTC
1e35ebd Update shell_commands 09 June 2021, 15:18:36 UTC
213d853 Merge branch 'jonbob/share/fix-freezetemp' (PR #4327) Remove limit on shr_frz_freezetemp and replace it with an abort The share code in the coupler currently calculates shr_frz_freezetemp based on a seawater freezing temperature option, but then limits it to not allow a freezing temperature below -2.0. This PR removes that limit and replaces it with an abort if the shr_frz_freezetemp is calculated to be below -2.6C. [non-BFB] for some A-, C-, and D-cases 09 June 2021, 14:41:09 UTC
3fa1c92 update comment 08 June 2021, 21:57:08 UTC
33a38bc Get edgeSignOnShell from meshPool in diagnostics 08 June 2021, 19:39:27 UTC
22d8829 Ocean: add topographic_wave_drag back to diagnostics_variables 08 June 2021, 18:34:37 UTC
14184cd Merge commit '8fbece86234243cf864933fedbd2b75556f591e6' into mattdturner/ocean/diagnostics_gpu_port 08 June 2021, 17:38:44 UTC
8fbece8 Wrap pointer retrieval in conditionals for PKGs 08 June 2021, 17:10:37 UTC
77f6d33 Remove accidental commented-out code 08 June 2021, 17:09:05 UTC
back to top