Skip to content

merge hongyili/mosart/mosart-heat-v3 into heat-TEPP #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
thurber wants to merge 1,523 commits into
base: feature/heat-TEPP
Choose a base branch
from
Draft

merge hongyili/mosart/mosart-heat-v3 into heat-TEPP #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1523 commits
Select commit Hold shift + click to select a range
6bc4383
theta model uses omega, not omega/p
mt5555 Dec 19, 2019
667156d
Merge branch 'tangq/atm/mozart-fix-activeATM-NArrm' (PR #3338)
jonbob Dec 19, 2019
6d8e819
Added basic RCEMIP compset definition
whannah1 Dec 19, 2019
e1bbbe0
Added omega nml var to disable rotation for RCE
whannah1 Dec 19, 2019
980e46e
Add CO2 VMR default for RCE
whannah1 Dec 19, 2019
b1a7b99
theta-l with pg2: dont divide omega_p by p.
mt5555 Dec 19, 2019
5be9d97
revert s as g*z + c_PT
oksanaguba Dec 19, 2019
815a8b8
fixing changes in clubb that should not be there
oksanaguba Dec 19, 2019
b65ed52
fixing changes in clubb that should not be there
oksanaguba Dec 19, 2019
1b18ace
fixing changes in clubb that should not be there
oksanaguba Dec 19, 2019
bf6c8b7
recompute s from new zm
oksanaguba Dec 20, 2019
227d764
Merge remote-tracking branch 'mt5555/E3SM/kgu53imex' (PR #3365)
AaronDonahue Dec 20, 2019
0f40cf3
Update RRTMGP interface to support RCE compset
whannah1 Dec 20, 2019
0141b68
Update RCE compset settings
whannah1 Dec 20, 2019
ee3fe96
remove usage of uniform_angle
whannah1 Dec 20, 2019
d0060cb
Add new namelist variables for RCE radiation
whannah1 Dec 20, 2019
3e72664
Added new namelist var constant_zenith_deg
whannah1 Dec 20, 2019
990d38b
Update mpas source framework for inc files
mark-petersen Dec 23, 2019
b2ef5fb
Add mpibroadcast for constant_zenith_deg
whannah1 Dec 23, 2019
5a8bed6
Add tests for F-EAMv1-RCEMIP
whannah1 Dec 23, 2019
07c37c6
change TE in clubb
oksanaguba Dec 23, 2019
dfae908
Update RCE compset - switch to prescribed aero
whannah1 Dec 24, 2019
1d6172f
Added default pe layout for ne30pg2 on Cori-KNL
whannah1 Dec 24, 2019
ce11387
with pg2 and dyn_npes<npes GLL grid had incorrect dimensions
mt5555 Dec 25, 2019
46f1dc6
add defaults for theta-l dycore
mt5555 Dec 29, 2019
62f0784
viscosity defautls for theta-l dycore
mt5555 Dec 29, 2019
bad2050
a few more tweaks to the theta-l defaults
mt5555 Dec 29, 2019
f23f608
more updates to theta testmods to preserve old settings
mt5555 Dec 29, 2019
0282e9c
update default description for variables set by dycore
mt5555 Dec 29, 2019
b4fb97e
one more testmod tweak to preserve BFB
mt5555 Dec 29, 2019
9e7bdcd
update DCMIP scripts for anvil
mt5555 Dec 30, 2019
acffe07
distinguishing names for test2_1 and test2_2 PDF files
mt5555 Dec 30, 2019
c25b7e7
tweak dcmip plots for automatic evaluation
mt5555 Dec 30, 2019
9843a4f
adding script to run all DCMIP tests and collect PDFs
mt5555 Dec 30, 2019
6ddfbc3
set cubed_sphere_map based on np4 vs pg2 grids
mt5555 Dec 31, 2019
205a88c
typos
mt5555 Dec 31, 2019
b1a96ee
Merge branch 'mt5555/dcmip-anvil-scripts' (PR #3370)
mt5555 Dec 31, 2019
afc60ae
dyn_target bugfixes, unitialized variabes
mt5555 Jan 1, 2020
4540a47
cosmetic change to use_case for RCEMIP
whannah1 Jan 2, 2020
6687c28
Added do_latitude_taper variable to gw_tend()
whannah1 Jan 2, 2020
98b752d
Added dycore_is() check for frontal gw scheme
whannah1 Jan 2, 2020
49999c2
Explicitly remove the darshan module for Cori.
ndkeen Jan 2, 2020
2a6e76a
Update to latest RRTMGP commit
brhillman Dec 19, 2019
e771493
Fixes to work with new gas_concentrations API
brhillman Dec 23, 2019
a622a1f
Update RRTMGP absorption coefficient data
brhillman Dec 23, 2019
278d8b8
Remove unused variable
brhillman Dec 23, 2019
6c2eccf
Remove unused variables
brhillman Jan 3, 2020
552beb1
Pointing to FATES tag sci1.31.1_api8.1.0
rgknox Jan 6, 2020
e87541a
Updated fates default parameter file to be consistent with api8.1
rgknox Jan 6, 2020
22b6812
Update project name to current allocation ClimateEnergy_4
amametjanov Jan 7, 2020
25a2340
Merge branch E3SM-Project/ndk/machinefiles/cori-unload-darshan (PR #3…
ndkeen Jan 7, 2020
17722e1
Limit test archiving to 1TB
amametjanov Jan 8, 2020
d11b78b
Merge branch 'mt5555/supercell-threadsafe' (PR #3353)
mt5555 Jan 8, 2020
2ca7244
jenkins_generic_job: Add timers for archiving
jgfouca Jan 8, 2020
f95f417
Merge branch 'jgfouca/cime/add_test_archive_timers' into master (PR #…
jgfouca Jan 8, 2020
0be1c61
cube_to_target: Prep this utility for physgrid work.
ambrad Jan 9, 2020
2621284
EAM: New physgrid topography tool.
ambrad Jan 7, 2020
96cec57
Merge remote-tracking branch 'MT/theta-xml-defaults2' into master (PR…
oksanaguba Jan 9, 2020
91272c3
Ignore buildlib_cmakec files
jgfouca Jan 10, 2020
54d82ce
Merge branch 'jgfouca/gitignore_buildlib_cmakec' into master (PR #3384)
jgfouca Jan 10, 2020
545ec4e
Fixed rad options in build-namelist
whannah1 Jan 10, 2020
e291614
get_cime_env: new tool for conveniently loading CIME env
jgfouca Jan 10, 2020
f149380
Rename to get_case_env
jgfouca Jan 10, 2020
41aa501
Merge branch 'jgfouca/cime/get_cime_env' into master (PR #3387)
jgfouca Jan 10, 2020
82df5fb
Fix Depends.ibm.cmake
jgfouca Jan 10, 2020
7622c75
Merge branch 'jgfouca/cime/Depends_ibm_fix' into master (PR #3388)
jgfouca Jan 10, 2020
836511c
HOMME, SL: Add compose_finalize.
ambrad Jan 11, 2020
b60170a
Couple dynamic land use and crop model
tanzeli1982 Nov 20, 2019
eea09e4
Add a single-point cropland LULCC test
tanzeli1982 Jan 12, 2020
428a44d
Fix the file format of VegetationDataType.F90
tanzeli1982 Jan 14, 2020
0cb77e2
Minor fix to HOMME for IBM compiler on Summit
dqwu Jan 15, 2020
11eca88
Merge branch 'mark-petersen/update_mpas_191223' (PR #3367)
jonbob Jan 15, 2020
2da76b6
Update mpas-source: switch to config module in del2
mark-petersen Jan 15, 2020
db0f253
Update tests.py to break HOMME and HOMMEBFB out into their own test s…
wadeburgess Jan 15, 2020
b92b42e
Add ocn_config to cmake
mark-petersen Jan 15, 2020
13c8440
Update tests.py
wadeburgess Jan 15, 2020
1523d43
Merge pull request #3397 from E3SM-Project/wadeburgess-homme-suite-ch…
wadeburgess Jan 15, 2020
5997072
Physgrid: Add trim to PHIS_d read.
ambrad Jan 16, 2020
8e249e6
Physgrid topo tool bug fix: Actually use smoothed phis.
ambrad Jan 16, 2020
7cf6e5e
Add critical sections around calls to shr_sys_irtc
worleyph Jan 16, 2020
1c673a1
Add irtc_rate variable to list of private variables in threaded region
worleyph Jan 16, 2020
6e336ad
Add atmospheric physics decomposition diagnostics
worleyph Jan 16, 2020
dff2e77
NERSC now has a new CFS filesystem and has copied the data for us, bu…
ndkeen Jan 16, 2020
589b13a
Add threadprivate declaration and remove critical sections
worleyph Jan 17, 2020
a4bc07c
Remove unnecessary inclusion of optional shr_sys_irtc parameter
worleyph Jan 17, 2020
50f3864
Further augment physics decompostion diagnostics output
worleyph Jan 17, 2020
46898fb
Merge branch 'mark-petersen/update_mpas_200115' (PR #3398)
jonbob Jan 17, 2020
019f896
call prim_finalize from stepon. avoid divide by zero in logfile output
mt5555 Jan 17, 2020
4d9b720
Merge branch 'ambrad/homme/physgrid-topo-part2' into v2-integration-u…
ambrad Jan 17, 2020
98608cc
Physgrid topo tool: Use write_latlon rather than hardcoded .false.
ambrad Jan 18, 2020
7259724
Physgrid topo tool: Fix a build error ifdef CAM.
ambrad Jan 18, 2020
64eaf4b
Document when shr_sys_irtc can be used in multi-threaded region
worleyph Jan 19, 2020
9d3880f
Replace calls to shr_sys_irtc with calls to system_clock
worleyph Jan 19, 2020
6b0e055
Merge branch E3SM-Project/ndk/machinefiles/nersc-move-to-CFS (PR #3404)
ndkeen Jan 20, 2020
78c948c
Merge branch 'ambrad/v2-integration-updates' (PR #3406)
mt5555 Jan 23, 2020
3c5fb7c
remove call to geo_dse
oksanaguba Jan 24, 2020
2452574
Homme: Fix vertical remap algorithm 10, PPM with linextrap boundaries.
ambrad Jan 24, 2020
e2d6a2f
ne30pg2_r05_oECv3 resolution configuration for v2 AMIP simulations.
ambrad Jan 24, 2020
6d3adaa
reducing timestep in preqx_ftype1 test
oksanaguba Jan 25, 2020
fe4ce56
Add more options for atm inithist
wlin7 Jan 26, 2020
3522b56
Merge branch 'MT/theta_omega_p_fix' into master (PR #3366)
oksanaguba Jan 27, 2020
63bd454
Merge branch 'origin/whannah/atm/disable-gw-lat-taper-for-SE' into ma…
oksanaguba Jan 27, 2020
025e7f3
Merge branch 'origin/oksanaguba/eam/energy-fixer' into master (PR #3281)
oksanaguba Jan 27, 2020
b59c445
Merge branch 'AMB/ambrad/homme/fix-vr-qalg10' into master (PR #3411)
oksanaguba Jan 27, 2020
aac1f53
Merge branch 'ambrad/ambrad/eam/ne30pg2_r05_oECv3-amip' (PR #3414)
mt5555 Jan 29, 2020
d1451cf
Merge branch 'dqwu/summit-fix' (PR #3393)
jqyin Jan 29, 2020
9f71cb8
Merge remote-tracking branch 'rgknox/rgknox/lnd/fates-api8.1' (PR #3385)
bishtgautam Jan 30, 2020
74e6845
Update SBeTR module to reduce memory leaks
amametjanov Jan 30, 2020
34bf362
Convert domain_type%set from string to logical for efficiency
amametjanov Jan 30, 2020
c3b5674
Remove memory leaks in ELM
amametjanov Jan 30, 2020
4f4b529
Add atm2srf file for ne30pg2.
ambrad Jan 31, 2020
ec55328
Added modex machine config files
Jan 31, 2020
bc3cf5a
Merge worleyph/cam/fix_chunk_cost (PR #3402)
wlin7 Feb 4, 2020
1929c29
Merge branch 'ndk/atm/init_qrl_idx' (PR #3324)
AaronDonahue Feb 4, 2020
ae200d3
Merge branch 'wlin/atm/more_inithist_opts' (PR #3416)
AaronDonahue Feb 4, 2020
5c095f5
Upgrading gcc/mpich/szip/hdf5/netcdf/pnetcdf for anlworkstation
dqwu Feb 4, 2020
98536c1
Merge branch 'azamat/theta/fflags' (PR #3364)
sarich Feb 6, 2020
992c3b0
Update ibm compiler flags on Summit
amametjanov Feb 6, 2020
ef53f26
Add USE_CBOOL macros for rrtmpg builds
amametjanov Feb 6, 2020
53280eb
Write stmt syntax typo
amametjanov Feb 6, 2020
89b6c76
Reduce cice optimization only when threading
amametjanov Feb 6, 2020
173e4dd
Homme: Make cdr_alg default 3 instead of 21.
ambrad Feb 3, 2020
30bf23a
Homme: Fix use of exner in physgrid.
ambrad Feb 3, 2020
0c24428
EAM: Update theta-SL-pg2 test.
ambrad Feb 7, 2020
ba603f7
Homme: Change cdr_alg from 30 to 3 in a test.
ambrad Feb 7, 2020
fee25dd
Merge branch 'brhillman/atm/update-rrtmgp' (PR #3375)
singhbalwinder Feb 7, 2020
357c741
Protect against divide-by-zero error in system tests
jgfouca Feb 7, 2020
67fcbd5
Merge branch 'jgfouca/cime/fix_div0_sys_test' into master (PR #3436)
jgfouca Feb 7, 2020
886ca36
Fix comment formatting.
ambrad Feb 7, 2020
c957e84
cam: fix bug in bld/configure
jgfouca Feb 7, 2020
8b7e0d4
Disable call to shr_taskmap_write in LND when INFO_TASKMAP_COMP is zero
worleyph Feb 10, 2020
d0ecbb1
Disable call to shr_taskmap_write in ROF when INFO_TASKMAP_COMP is zero
worleyph Feb 10, 2020
c7e9b7f
Disable call to shr_taskmap_write in GLC when INFO_TASKMAP_COMP is zero
worleyph Feb 10, 2020
a509397
Disable call to shr_taskmap_write in OCN when INFO_TASKMAP_COMP is zero
worleyph Feb 10, 2020
864c9d6
Disable call to shr_taskmap_write in ICE when INFO_TASKMAP_COMP is zero
worleyph Feb 10, 2020
837cfb8
Updates land initial condition for 20th Century CMIP6 compset
bishtgautam Sep 3, 2019
53d16d2
Merge pull request #3429 from E3SM-Project/dqwu/anlworkstation_upgrade
jayeshkrishna Feb 10, 2020
0e89f40
Merge branch 'jgfouca/cam/fix_configure_bug' (PR #3437)
singhbalwinder Feb 10, 2020
244c622
Merge branch 'bishtgautam/lnd/update-land-initial-condition-for-20thC…
jqyin Feb 11, 2020
80118d9
Add new ozone file in netcdf3 format
whannah1 Feb 11, 2020
58aa58e
modify irrigation scheme for tri-grid config
hydrotian Feb 12, 2020
febc50d
fix deficit passing issue
hydrotian Feb 12, 2020
a35eccb
Merge branch 'whannah/atm/add-global-RCEMIP-compset' (PR #3371)
rljacob Feb 12, 2020
6a32f60
Updates PGI compiler to version 19.7
singhbalwinder Jan 8, 2020
9bcb8a8
Update PGI to v19.10
amametjanov Feb 13, 2020
52dfd8f
Add r0125_r0125_oRRS15to5 grid
wlin7 Feb 13, 2020
1f9b681
Fix mpi serial link in cmake
jgfouca Feb 13, 2020
e924430
Merge branch 'jgfouca/cime/cmake_fix_libmpi_serial' into master (PR #…
jgfouca Feb 13, 2020
c16415e
Rename optics to reflect choice of scheme
brhillman Feb 13, 2020
d692718
Ensure user requested walltime matches machine walltime_format
jgfouca Feb 13, 2020
f6bd11c
Merge branch 'jgfouca/cime/ensure_walltime_format' into master (PR #3…
jgfouca Feb 13, 2020
f44c637
Enable using old optics (and add tests)
brhillman Feb 13, 2020
1d9236b
Fix unit tests
jgfouca Feb 13, 2020
354ed30
The initialization bug in CLUBBv2 interface
Feb 13, 2020
05e7fa2
Adds output of topography in land history file
bishtgautam Feb 14, 2020
510306e
Merge branch 'AMB/ambrad/eam/pg2-cdr-config-T-fix' into master (PR #3…
oksanaguba Feb 14, 2020
c8ca5ae
Remove state and pbuf from cloud_rad_props
brhillman Feb 14, 2020
cefc09a
Remove state and pbuf from old optics
brhillman Feb 14, 2020
13081e4
Move state and pbuf out of get_cloud_optics_*
brhillman Feb 14, 2020
5485f7c
Remove cam_optics_type and just pass arrays
brhillman Feb 14, 2020
d2acc26
Merge branch 'azamat/summit/update-ibm-flags' into master (PR #3432)
minxu74 Feb 14, 2020
4095d0b
Move state/pbuf out of cloud optics routines
brhillman Feb 15, 2020
91172d4
Simplify set_aerosol_optics
brhillman Feb 15, 2020
d3fed47
Cloud optics to use assumed-shape arrays
brhillman Feb 17, 2020
3821767
Shorten cloud_optics variable names
brhillman Feb 17, 2020
f92a436
Simplify/breakup set_gas_concentrations
brhillman Feb 17, 2020
417e78a
Make ninst argument type explicitly int
jgfouca Feb 17, 2020
fe74f4d
Merge branch 'jgfouca/cime/fix_multi_driver_type' into master (PR #3451)
jgfouca Feb 17, 2020
7bccba7
Move day compression out of set_rad_state
brhillman Feb 17, 2020
ac2968c
Shorten albedo names
brhillman Feb 17, 2020
2a9b359
Move setting rad state up to driver level
brhillman Feb 17, 2020
da3de69
Move setting albedo up a level
brhillman Feb 17, 2020
eeb29dc
Move icall loop to radiation_tend level
brhillman Feb 18, 2020
5eba633
Move handling coszrs up to radiation_tend
brhillman Feb 18, 2020
7c102f2
Move optics up to radiation_tend
brhillman Feb 18, 2020
d769e0b
Move gas handling up to radiation_tend
brhillman Feb 18, 2020
4841a24
Use arrays size ncol instead of pcols
brhillman Feb 18, 2020
d44d2a7
Merge wlin/lnd/r0125_oRRS15to5 (PR #3442)
wlin7 Feb 19, 2020
f37c4c2
In Mosart ensure that entire user str is copied before writing to file
jayeshkrishna Feb 19, 2020
4c73ce7
Merge branch 'azamat/clm/fix-memleaks' (PR #3420)
bishtgautam Feb 20, 2020
ee495a5
Fixed C mass blanace error when use_pheno_flux_limiter=.true.
jinyuntang Oct 24, 2019
85297a7
Implementation to use cosp2 as submodule
wlin7 Feb 20, 2020
80e7eca
Reverse manual changes to .gitmodules
wlin7 Feb 20, 2020
43efa11
Add auto updated .gitmodules
wlin7 Feb 20, 2020
84faa4d
Lower simd optimization on cam+pgi+compy for reproducibility
amametjanov Feb 20, 2020
c7c962f
Update Cosp.cmake for two new simulator interface modules
wlin7 Feb 21, 2020
9ce58e0
adding XMl for some PG2 compsets
mt5555 Feb 21, 2020
5f00864
Update cospsimulator_intr.F90 to be compatible with cosp2.1.4
wlin7 Feb 21, 2020
333ccb2
fix ELM usecases so r05 land does not use ne30np4 surfdata files
mt5555 Feb 22, 2020
1b1a801
ne30pg2 grids should share pelayouts from ne30np4 grids
mt5555 Feb 22, 2020
e33792e
Merge branch 'singhbalwinder/machines/compy-pgi-19.7'(PR#3382)
singhbalwinder Feb 24, 2020
4bb35e6
undo whitespace change
mt5555 Feb 24, 2020
346a25b
Compy 46-node PE layout for coupled pg2 config.
ambrad Feb 24, 2020
043a2f5
calculate_heating_rate should take array args
brhillman Feb 25, 2020
996e709
Merge branch 'worleyph/components/disable_taskmap_write' (PR #3439)
rljacob Feb 26, 2020
3ac52ef
couple WM with inundation
hydrotian Feb 26, 2020
6b8ba45
remove commented out lines
hydrotian Feb 26, 2020
98cd7bc
For NERSC, change the PROJECT (repo name) from "acme" to "e3sm".
ndkeen Feb 27, 2020
534cded
Remove cosp1
wlin7 Feb 28, 2020
77b6390
Merge branch 'bishtgautam/lnd/topo-output' (PR #3448)
jqyin Feb 28, 2020
040855a
Compy 21 (S) and 90 (L) node PE layouts for coupled pg2 config.
ambrad Feb 29, 2020
437ea27
Add SYPD estimate based on 1-mo run for pg2 coupled L PE layout.
ambrad Mar 1, 2020
872dddb
Merge pull request #8 from ambrad/ambrad/pg2compsets-pesxml
mt5555 Mar 2, 2020
621e360
Merge branch 'mark-petersen/ocean/single_precision_output' (PR #3360)
jonbob Mar 2, 2020
d00d038
Disable MODIS simulator until a hidden issue is addressed.
wlin7 Mar 2, 2020
21777ac
add class setup and teardown for CIME tools test class
sarich Mar 3, 2020
2ddbcb0
For Cori, add e3sm to the SAVE_TIMING directive which will affect per…
ndkeen Mar 3, 2020
266ed93
Rename references to NLDAS to avoid confusion with NLDAS2
jonbob Mar 3, 2020
97358a1
Merge branch 'jayeshkrishna/fix_mosart_1d_str_arr_wr' (PR #3463)
bishtgautam Mar 3, 2020
bfb5f55
Merge branch 'zhan391/atm/E3SM_CLUBBv2_INIT' (PR #3454)
singhbalwinder Mar 3, 2020
6d70688
Merge serbinsh:modex_machine_configs (PR #3424)
wlin7 Mar 3, 2020
c1feb9a
Disable database integrity check
jgfouca Mar 4, 2020
b54d9a2
Merge branch 'jgfouca/cime/disable_db_protection' into master (PR #3480)
jgfouca Mar 4, 2020
a76037c
Merge branch 'jonbob/scripts/rename-nldas' (PR #3478)
jonbob Mar 4, 2020
00aff77
Merge branch E3SM-Project/ndk/machinefiles/nersc-project-e3sm (PR #3473)
ndkeen Mar 4, 2020
2f91b63
Merge remote-tracking branch 'MT/pg2compsets' into master (PR #3459)
oksanaguba Mar 4, 2020
9d1c7c9
Move ec and slingo use statements
brhillman Mar 6, 2020
f1f3e59
Add documentation on compress_optics_sw
brhillman Mar 6, 2020
903f564
Clarify changeseed and make sw/lw consistent
brhillman Mar 6, 2020
94e16fc
Changed the use of sd_cs in call to subsample_and_optics to fix
wlin7 Mar 8, 2020
c60a4c4
Merge wlin/atm/cosp2_with_submodule (PR #3458)
wlin7 Mar 9, 2020
ee97e26
fix irrigation deficit bug
hydrotian Mar 10, 2020
b817336
Update mpas-source, COMPASS only
mark-petersen Mar 5, 2020
2c27dd4
Merge branch 'tizhou/two-way-irrigation-trigrid' (PR #3441)
bishtgautam Mar 11, 2020
9521bca
Upgrading PnetCDF lib on anvil
jayeshkrishna Mar 6, 2020
f40fcd6
Merge branch 'sarich/add-gen-domain-test' into master (PR #3418)
jgfouca Mar 11, 2020
291d975
Merge branch 'mark-petersen/ocean/update_mpas_COMPASS_200305' (PR #3483)
jonbob Mar 12, 2020
9b42020
Fix summit/ibm pnetcdf linking
jgfouca Mar 11, 2020
3b4a03c
More fixes
jgfouca Mar 12, 2020
73854b9
restore original pnetcdf
jgfouca Mar 12, 2020
e854425
Updating more modules
jgfouca Mar 13, 2020
a5a4486
Replace WHERE with DO loops in landice for PGI v19.10
jonbob Mar 16, 2020
869b562
Merge branch 'jgfouca/cime/fix_summit_pnetcdf' into master (PR #3496)
jgfouca Mar 13, 2020
bc5c981
Merge branch 'jayeshkrishna/upgrade_pnetcdf_1_11_anvil_intel' (PR #3488)
sarich Mar 16, 2020
30abf7c
Merge branch 'tanzeli/lnd/elm-erosion-v3' (PR #3389)
bishtgautam Mar 16, 2020
2649126
Merge branch 'jinyuntang/lnd/c_inbal_fix' (PR #3257)
bishtgautam Mar 17, 2020
273b128
Fix the incorrect merge
bishtgautam Mar 17, 2020
bd98408
Merge branch 'bishtgautam/lnd/fix-merge' (PR #3500)
rljacob Mar 17, 2020
477faf4
Merge branch 'jonbob/landice/replace-where-with-do-loops' (PR #3498)
jonbob Mar 18, 2020
a949662
Update mpas-source: init mode, COMPASS, minor diagnostics for ice she…
mark-petersen Mar 18, 2020
a309fe5
Merge branch 'mark-petersen/mpas/update_init_mode' (PR #3503)
jonbob Mar 20, 2020
752e07a
Merge branch 'brhillman/atm/refactor-cloud-optics'(PR #3455)
singhbalwinder Mar 20, 2020
38d7fe4
Submodule operations must now be recursive
jgfouca Mar 23, 2020
ae7ecea
Merge branch 'jgfouca/sub_ops_need_to_be_recursive' into master (PR #…
jgfouca Mar 23, 2020
edb3fac
Fix bugs in latent heat calculation and other minor change
liho745 Mar 25, 2020
87e751d
fix a bug in coupling MOSART-heat with wm and others
liho745 Apr 20, 2020
b10a20e
Change the formula of latent heat for water vaporization
liho745 May 24, 2020
1843e7a
delete unnecessary comments
liho745 May 28, 2020
343a277
a few minor fixes on format, wording etc
liho745 Jun 9, 2020
1c71888
Merge branch 'mosart-heat-v3' into feature/heat-TEPP-and-hongyi-v3
thurber Oct 7, 2020
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
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
*.pyc
buildnmlc
buildlibc
buildlib_cmakec

# Ignore emacs backup files
*~
16 changes: 14 additions & 2 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,21 @@
url = git@github.com:MPAS-Dev/MPAS-Model.git
[submodule "externals/kokkos"]
path = externals/kokkos
url = git@github.com:kokkos/kokkos.git
branch = develop
url = git@github.com:E3SM-Project/kokkos.git
branch = e3sm/kokkos
[submodule "components/cam/src/physics/rrtmgp/external"]
path = components/cam/src/physics/rrtmgp/external
url = git@github.com:RobertPincus/rte-rrtmgp.git
branch = develop
[submodule "externals/scorpio"]
path = externals/scorpio
url = git@github.com:E3SM-Project/scorpio.git
branch = master
[submodule "externals/scorpio_classic"]
path = externals/scorpio_classic
url = git@github.com:E3SM-Project/scorpio.git
branch = scorpio_classic
[submodule "components/cam/src/physics/cosp2/external"]
path = components/cam/src/physics/cosp2/external
url = git@github.com:CFMIP/COSPv2.0.git
branch = CESM_v2.1.4
3 changes: 3 additions & 0 deletions cime/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,6 @@ scripts/Tools/JENKINS*

# Ignore anything that are produced under scripts "cases" directory
/scripts/cases/

#Ignore nuopc driver available seperatly
src/drivers/nuopc
Loading