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

sort by:
Revision Author Date Message Commit Date
246b7f5 Adds mpas interface for icepack bgc Needs to be tested and merged with main icepack-integration branch BFB in the physics. 11 October 2023, 22:00:31 UTC
4b6febf Merge pull request #30 from eclare108213/update_icepack_7 Update icepack to hash cb0d946, fix mass conservation 18 September 2023, 15:23:01 UTC
ea68ac2 fix Registry description field 15 September 2023, 21:17:57 UTC
01e3d6a add config_frazil_coupling_type (cpl_frazil in icepack) 15 September 2023, 20:03:35 UTC
a41cafb updating Icepack to hash cb0d946; fixes water and salt mass conservation error 15 September 2023, 17:19:51 UTC
c65afc0 Merge pull request #29 from E3SM-Project/njeffery/seaice/merge-snow-integration-master Completes snow interface 01 September 2023, 00:19:39 UTC
7e2cfd3 Moved get arrays outside of the if restart loop. Fixes a bug where snow tracers are used without get_array inside a restart. Bug was introduced in this PR and appeared in both mpas_seaice_column and mpas_seaice_icepack. 29 August 2023, 19:48:10 UTC
f38b5b0 Changes the name of a snow config option 1. config_wind_snow_loss_factor --> config_snow_redistribution_factor 2. Removes an unnecessary if abort loop. BFB 25 August 2023, 15:38:04 UTC
acd21e9 Merge step-snow interface changes with current integration branch Merges remote-tracking branch 'origin/njeffery/seaice/add-step-snow-icepack-part2' into njeffery/seaice/merge-snow-integration-master 24 August 2023, 20:25:26 UTC
f6bf080 Merge pull request #28 from eclare108213/oddsandends1 Miscellaneous cleanup of colpkg calls and references 24 August 2023, 19:07:49 UTC
d19541b remove seaice_column_ocean_mixed_layer; inline colpkg_enthalpy_snow, colpkg_salinity_profile; clean up 23 August 2023, 00:47:09 UTC
20e393d replace colpkg_ with icepack_ for sea_freezing_temperature, liquidus_temperature, enthalpy_snow; remove commented-out code 22 August 2023, 21:39:48 UTC
e67d37a call icepack_aggregate, clean up warnings calls, remove commented-out code 22 August 2023, 20:56:30 UTC
7d19487 Change colpkg_ to icepack_ for init_itd, ice_strength; remove colpkg_init_thermo, _init_orbit, _step_ridge 22 August 2023, 19:38:52 UTC
413fd9f Merge pull request #27 from eclare108213/update_icepack_6 updating Icepack to hash e751022 21 August 2023, 20:08:27 UTC
9408969 updating Icepack to hash e751022 21 August 2023, 18:58:29 UTC
f0551b4 Adds mpassi-icepack interface for snow flag options 1. Changed 30percent/30percentsw option so that it works like the bulk option in icepack. Suggestions to fix conservation for this option is commented out for further testing but still needed in both column and icepack. (BFB in default option, nonBFB with 30percent or 30percentsw). 2. Added namelist field config_wind_snow_loss_fraction for constant snwlvlfac to pass to icepack (BFB) 3. Corrected snow packages in Registry and config warnings to allow for multiple snow tracer flag options (BFB) 4.Initialization values for snow tracers added to ice_itd.F (nonBFB bugfix, consistent with icepack) 5. Modify the expression for snow ice and snow liquid tracer change due to sublimation - Allows for additional mass loss to come from the snow liquid tracer if the snow ice tracer has a value < rhos. (nonBFB, consistent with icepack) 6. Adds missing changes to snow ice/liquid tracers from bottom melt. Bugfix. (nonBFB, consistent with icepack) 7. Adds mpas-icepack interface for step-snow in mpas_seaice_icepack.F 14 August 2023, 16:40:30 UTC
bf50a22 Merge pull request #25 from eclare108213/thermo_itd2 Integrate icepack_step_therm2 28 July 2023, 17:42:52 UTC
8309830 uncomment column itd changes, and informational comments 27 July 2023, 21:12:08 UTC
3caa764 revert ice_itd.F90 for CICE-QC testing 23 July 2023, 21:59:23 UTC
a53c3be step_therm2 integration, bug fix in column 23 July 2023, 21:44:22 UTC
f8716bd Merge pull request #24 from eclare108213/update_icepack_5 updating Icepack to hash e8e7d7d 20 July 2023, 15:04:46 UTC
77d1d8d updating Icepack to #e8e7d7d 19 July 2023, 22:27:26 UTC
d205577 Merge pull request #23 from eclare108213/njeffery/seaice/add-step-snow-icepack Corrects use of snow flags and adds flag consistency checks 13 July 2023, 21:28:11 UTC
a9c8812 Put snow flag consistency checks in mpas_seaice_icepack 12 July 2023, 21:50:47 UTC
67ed69a Corrects use of snow flags and adds flag consistency checks -Config_use_effective_density activates density from compaction which is needed for ITD snow redistribution -Config_use_snow_grain_radius activates snow grain radius which needs snow liquid and snow ice tracers -Includes a bugfix in snow_redistribution when using 1 snow layer will need to be fixed in Icepack BFB with snow flag defaults except for the very initial value of effective snow density 12 July 2023, 19:37:43 UTC
eaaac15 Merge pull request #22 from eclare108213/update_icepack_4 updating Icepack to hash b2b8066 07 July 2023, 17:11:54 UTC
3384c3d updating Icepack to hash b2b8066 07 July 2023, 16:35:31 UTC
d25dc66 Merge pull request #19 from eclare108213/snicar_active activate snicar in icepack, check values 15 June 2023, 18:38:01 UTC
1addc7a add -DUSE_SNICARHC for standalone testing 13 June 2023, 23:14:27 UTC
d694da2 Merge pull request #20 from eclare108213/mechred call icepack_step_ridge 02 June 2023, 21:54:39 UTC
38d04c6 clean up warning and abort 02 June 2023, 21:04:11 UTC
b7095d5 Adding missing Tf argument to icepack_step_ridge call 02 June 2023, 19:56:35 UTC
5ef2ffa Initial integration of icepack step_ridge 02 June 2023, 19:55:41 UTC
95647ae activate snicar in icepack, check values 01 June 2023, 20:31:06 UTC
ffd5a47 Merge pull request #18 from eclare108213/update_icepack_3 updating Icepack to hash 2fc81b4 31 May 2023, 15:31:09 UTC
e69c167 updating Icepack to hash 2fc81b4 27 May 2023, 03:02:48 UTC
79526bd Merge pull request #16 from eclare108213/update_icepack_2 updating Icepack to hash 6ca316f, adding wlat for FSD, updating colpkg 26 May 2023, 19:34:55 UTC
2978bdf adding missing constants definitions for column configuration 25 May 2023, 20:40:35 UTC
a4c5bd3 Merge commit '01e5f2a4f265976526e7aad67bd47b6efd98fa44' of github.com:eclare108213/E3SM into update_icepack_2 25 May 2023, 16:37:52 UTC
7836b8b Merge pull request #17 from E3SM-Project/njeffery/seaice/eclare-update-icepack-2 Adds changes for consistency with icepack and bugfix for boundary layer 28 April 2023, 19:55:42 UTC
7435ba3 Adds changes for consistency with icepack and bugfix for boundary layer -changes initialization of counter to 1 in atm-boundary nonBFB because it changes the number of interations -Initializes airOceanDrag ratio to 1 BFB except when atmos_boundary_layer = 'constant' and only changes restart output for airOceanDrag ratio. -Corrects uVel -> vVel in atmos_boundary (bugfix, nonBFB) 28 April 2023, 19:44:54 UTC
d9075d2 updating Icepack to hash 6ca316f, adding wlat for FSD 14 April 2023, 20:38:45 UTC
e81ac33 Merge pull request #15 from darincomeau/icepack-integration-merge-20230412 Update to E3SM master 20230412 14 April 2023, 14:30:34 UTC
c91578e Merge remote-tracking branch 'e3sm/master' into icepack-integration-merge-20230412 12 April 2023, 20:33:14 UTC
ad37255 Merge branch 'hkang/ocean/si-openacc' (PR #5583) Add OpenACC directives in the semi-implicit barotropic mode solver The semi-implicit barotropic solver in E3SM ocean component has been ported on GPU by adding OpenACC directives. To compile MPAS-O with MAGMA or CUBLAS for GPU-accelerated linear algebra, some additions (USE_MAGMA, USE_CUBLAS) have been made to mpas-framework/Makefile. A subroutine si_halo_exch is added in the semi-implicit solver code, which is very experimental, to use GPU-aware MPI for local halo exchanges during solver iterations. The semi-implicit barotropic mode solver is not currently used in E3SM, so it does not affect default configurations. [BFB] 12 April 2023, 18:40:12 UTC
a6b2f55 Add OpenACC directives in SI solver - Porting the semi-implicit barotropic mode solver on GPU using OpenACC directives - Update Makefile for MAGMA, CUBLAS, GPU_AWARE_MPI use - A subroutine 'si_halo_exch' is added in the SI solver code, which is very experimental, to use GPU-aware MPI for local halo exchanges during solver iterations. Add SI halo exch routine and related codes Implmentation of si_halo_exch Add SI solver opencacc code 11 April 2023, 21:34:47 UTC
2895bcd Merge branch 'akturner/mpas-seaice/weak-formulation-bug' (PR #5474) Fixes issues with weak sea ice spatial operators formulation Recent refactoring to sea ice velocity initialization broke some test cases using the weak formulation. This allows the weak formulation to run successfully. Fixes #5473 [BFB] 11 April 2023, 18:36:09 UTC
495183d Merge branch 'jgfouca/cime_update_2023_04_05' into master (PR #5581) Update CIME submodule ... to 9a12fd20a6af1da27d128bb4710f7f41c36363ad Changes: 1) jenkins_generic_job: Add support for queue selection 2) Loosen the XSD xml specification for config_machines.xsd to be consistent with env_mach_specific.xsd 3) minor updates to allow moab driver 4) should not test timestep of stub components 5) Adding support for ADIOS for E3SM !!! Fixes: 1) bless_test_results: Fix mistake in re match counting 2) replay.sh: fixes restoring quotes to command arguments 3) create_test: fixes single_exe create_test option 4) check_input_data: Expand SharedArea coverage to entire implementation [BFB] 11 April 2023, 15:18:05 UTC
8488f12 Merge pull request #11 from eclare108213/vertical_thermo Add Icepack's vertical thermo 10 April 2023, 22:44:20 UTC
c7f67cb Merge branch 'xylar/ocn/new-partition-files' (PR #5568) Update partitions across cores for 4 MPAS-Ocean meshes This merge points to new partition files for each of the following 4 MPAS-Ocean meshes. Each mesh has about 400 files that are expected to support nearly any conceivable core count. Meshes with updated partitions: * EC30to60E2r2 * ECwISC30to60E2r1 * SOwISC12to60E2r4 * WC14to60E2r3 Partition files have been moved into a partitions subdirectory in each ocn/mpas-o/<mesh> directory. We decided this was better than putting partition files in share/meshes/mpas/ocean. [NML] [non-BFB] only for mpaso globalStats files for these meshes does not change the ocean state 10 April 2023, 19:16:25 UTC
55913a8 Merge branch 'cbegeman/ocn/new-impl-top-drag-feature' (PR #5447) New ocean implicit top drag feature This PR creates a new option to use implicit top drag in the same manner as implicit bottom drag. It assumes that the only setting in which top drag will be used is in land-ice-covered regions. This feature is off by default (stealth). Implicit top drag is activated by setting: config_use_implicit_top_drag = .true. config_implicit_top_drag_coeff > 0 config_land_ice_flux_mode = 'standalone' (while also ensuring that at least part of the domain has landIceFraction > 0). [NML] [BFB] - Stealth 10 April 2023, 18:50:57 UTC
721b938 Merge branch 'yfenganl/eamelm/add-dustemisK14' (PR #5531) Add a new dust emission scheme from Kok et al. (2014) The new scheme includes time-varying soil erodibility factor and high-latitude sources. A namelist option is added to turn on the new emission scheme. [stealth] [BFB] [NML] new shr_dust_nl section introduced. 10 April 2023, 14:45:16 UTC
4e3bed3 Merge icepack-integration PR#12 and add warnings calls for therm1 09 April 2023, 13:25:51 UTC
a4d2887 Merge pull request #12 from apcraig/snicarad Update Icepack warnings calls, cori-haswell pes 08 April 2023, 13:03:00 UTC
cd2e94a Get rid of missing test suite 08 April 2023, 02:56:20 UTC
e037d88 Merge branch 'jasonb5/cime_config/fixes_st_archive_nodes' into master (PR #5562) Fixes st_archive jobs taking more than 1 node CIME overrides a jobs number of nodes with tasks_per_node / task_count, both must be defined. [BFB] 07 April 2023, 17:14:02 UTC
83a5bc3 Cleanup smpd_utils use in eam's dust_model and replace it with spmdMod in elm 07 April 2023, 02:01:33 UTC
b8b2475 Update DUSTMod.F90 06 April 2023, 22:21:19 UTC
44e842c Update DUSTMod.F90 06 April 2023, 21:56:31 UTC
3f68a12 Update dust_model.F90 06 April 2023, 21:53:17 UTC
a114633 Merge branch 'jonbob/grids/fix-domain-file' (PR #5580) Fix domain file name for oQU240wLI The domain for ocn/ice grid oQU240wLI was pointing to a non-existent file. This replaces it with the correct file. Fixes #5579 [BFB] for all currently tested configurations 06 April 2023, 18:29:15 UTC
a0a5dfe Merge branch 'cbegeman/ocn/cleanup-wetting-drying-with-klimits' (PR #5418) Clean-up ocean wetting and drying routine Clean-up the wetting and drying routine in MPAS-Ocean and make a few bugfixes in that routine. This routine is not used in E3SM and only impacts the standalone model. [BFB] 06 April 2023, 18:24:43 UTC
b90b6bc Merge branch 'whannah/mmf/samxx-tuning-mods' (#5578) This PR adds ifdef blocks to expose climate tuning parameters for SAM++. It is preferable to expose these as namelist variables, but in this case we don't expect SAM++ to be used for many coupled climate experiments due to the unsophisticated microphysics and prescribed aerosols. Also, exposing namelist values will require a lot more changes, so ifdefs will simplify getting the MMF coupled experiments running again. [BFB] 06 April 2023, 17:40:28 UTC
ac27e8e Merge branch 'azamat/anvil/pes-for-tests' (PR #5558) Add smaller PE-layouts for tests on Anvil to get faster queue throughput. [NML] - in cime_pes namelists [non-BFB] - in mpaso.hist.am.globalStats outputs 06 April 2023, 16:54:26 UTC
db598dc Merge branch 'worleyph/share/util/fix_potential_nonrepro' (PR #5560) Eliminate potential nonreproducibility in final local sum The default reprosum algorithm converts each floating point summand into a vector of integers representation. These vectors are summed locally first, and then globally (using an mpi_allreduce). All of this is exact and reproducible. The final step is to convert the final sum, in the vector of integers representation, back into a floating point value. This final sum begins by converting each element of the integer vector into a floating point value, and then adding these, smallest to largest. Round off can occur in the least significant digit of the final result, and whether round off occurs is sensitive to the particular floating point summands. The numbers of MPI tasks and OpenMP threads can affect the length of the integer vector, and thus the floating point summands. In consequence, reproducibility with respect to degree of parallelism is not guaranteed. (The situation in which reproducibility is lost has never been observed in E3SM simulations, but it cannot be ruled out.) This PR modifies the final summation so that the same set of floating point summands is generated independent of the number of MPI tasks and number of OpenMP threads, establishing reproducibility. Fixes #5276 [non-BFB] 06 April 2023, 16:43:26 UTC
5d06618 clean up associated with rebase 06 April 2023, 01:56:02 UTC
ab9cfbe Update DUSTMod.F90 06 April 2023, 01:42:21 UTC
8dcd3c8 Update Icepack integration, mpas_seaice_icepack.F - Update dEdd_snicar-ad parameter settings passed to Icepack Works with config_column_physics_type = 'icepack' config_use_snicar_ad = true Also need -DUSE_SNICARHC, added following to universal.cmake manually if (COMP_NAME STREQUAL mpassi) string(APPEND CPPDEFS " -DUSE_SNICARHC") endif() - Update seaice_icepack_write_warnings, write icepack output and abort if necessary - Add calls to seaice_icepack_write_warnings after every icepack call - Add call to icepack_configure - Add ability to write out Icepack parameters to unit 101 (fort.101), commented out Update Core-haswell D-case pe layout default, now set to 256 pes 06 April 2023, 01:31:38 UTC
d02f66f Update automated testing for this feature 05 April 2023, 21:44:25 UTC
c292bec Merge branch 'cbegeman/ocn/new-floating-land-ice-vars' (PR #5464) New ocean variables for floating land ice This PR adds new variables to represent floating land ice. This is a necessary step toward coupling with an ice sheet model component (MALI). * landIceMask and landIceFraction (existing variables) now represent both grounded and floating land ice. * landIceFloatingMask and landIceFloatingFraction (new variables) represent only floating land ice. The landIceFloating* variables are used to modulate land ice fluxes, whereas the landIce* variables are used to mask out certain fields, as before. landIce* variables also modulate top drag, as we want to include the effect of top drag on thin film regions to slow flow. [NML] [non-BFB] 05 April 2023, 19:58:06 UTC
a3b334c Merge remote-tracking branch 'needhamfork/JFN-soilmoisture' (PR #5508) This PR changes the condition for a higher initial value of soil moisture so that all FATES runs, not just FATES-Hydro, will be initialized with higher soil moisture. This is to improve the establishment of forest in bare ground simulations. See FATES issue here NGEET/fates#994 and discussion here NGEET/fates#985. [non-BFB] FATES only 05 April 2023, 17:22:03 UTC
282339b Fix domain file name for oQU240wLI 05 April 2023, 16:37:02 UTC
2e1937f Update CIME submodule ... to 9a12fd20a6af1da27d128bb4710f7f41c36363ad Changes: 1) jenkins_generic_job: Add support for queue selection 2) Loosen the XSD xml specification for config_machines.xsd to be consistent with env_mach_specific.xsd 3) minor updates to allow moab driver 4) should not test timestep of stub components 5) Adding support for ADIOS for E3SM !!! Fixes: 1) bless_test_results: Fix mistake in re match counting 2) replay.sh: fixes restoring quotes to command arguments 3) create_test: fixes single_exe create_test option 4) check_input_data: Expand SharedArea coverage to entire implementation [BFB] 05 April 2023, 15:47:55 UTC
de9ca1e add ifdefs around primary MMF tuning parameters 05 April 2023, 15:26:54 UTC
1ba1e50 Update DUSTMod.F90 05 April 2023, 05:53:33 UTC
6852a56 Add new ocn test suite to e3sm_developer 04 April 2023, 19:55:03 UTC
3678fe7 Add testdef capability to mpaso and new test for this stealth feature 04 April 2023, 19:45:40 UTC
e9f7f5e fix spelling error in comment 04 April 2023, 18:51:59 UTC
03825c9 Move icepack_configure call earlier in the initialization. Clean up. 04 April 2023, 18:20:39 UTC
b6cec0c Updating the PR#5531 for Super BFB tests [BFB] - Bit-For-Bit See confluence for a more detailed description about these tags. 04 April 2023, 01:46:40 UTC
9b83524 Update branch from eclare108213/seaice/icepack-integration 03 April 2023, 21:43:36 UTC
02c8cf3 Updating the dust emission PR #5531 for the super BFB tests [BFB] See confluence for a more detailed description about these tags. 03 April 2023, 18:55:22 UTC
e26bf44 Merge branch 'yfenganl/eamelm/add-dustemisK14' 03 April 2023, 18:45:26 UTC
82fe7ad Merge pull request #10 from eclare108213/set_parameters Initialize Icepack constants using values in ice_constants_colpkg.F90 03 April 2023, 16:00:00 UTC
6d267e7 Updating the dust emission branch #5531 Modified a couple of cime configuration files for BFB tests [BFB] - Bit-For-Bit [NML] - Namelist Changing See confluence for a more detailed description about these tags. 03 April 2023, 15:58:18 UTC
aa144a6 Make changes to mct driver for land_ice_flux_mode = off 03 April 2023, 15:16:57 UTC
d1ec5b0 Make LI flux mode `off` for meshes without ISC We want `config_land_ice_flux_mode` to be `off` for most meshes but to be one of: * `pressure_only` (default) * `standalone` if `$OCN_ISMF = internal` * `coupled` if `$OCN_ISMF = coupled` 03 April 2023, 15:16:57 UTC
cef278b Point to new initial contions The new initial conditions have: * `landIceFloatingMask=landIceMask` * `landIceFloatingFraction=landIceFraction` 03 April 2023, 15:16:57 UTC
fa71ec8 Check for invalid values in landIceFloatingMask 03 April 2023, 15:16:57 UTC
2041e46 Fix MLD computation with land ice draft 03 April 2023, 15:10:43 UTC
78a1fb7 Fix MLD AM with land ice draft 03 April 2023, 15:10:43 UTC
259b747 Add landIceFloatingFraction to forcing 03 April 2023, 15:10:43 UTC
22dd1cf Never generate frazil ice below grounded land ice 03 April 2023, 15:10:43 UTC
f63b9f9 Continue using landIceMask to exclude ideal age tracers 03 April 2023, 15:10:43 UTC
7c6480a Use landIceFloatingMask for mixed layer computations 03 April 2023, 15:10:43 UTC
39f5cd5 Use landIceFloatingMask for surface flux attenuation 03 April 2023, 15:10:43 UTC
25ef605 Use landIceFloatingMask for effective density 03 April 2023, 15:10:43 UTC
060f4fa Use landIceFloating* vars for melt fluxes 03 April 2023, 15:10:43 UTC
2eb90b2 Add landIceFloating* vars to analysis members 03 April 2023, 15:10:43 UTC
back to top