Skip to content
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.

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

Update e3sm project #624

Merged
merged 3 commits into from
Apr 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion E3SM-Project
Submodule E3SM-Project updated 85 files
+1 −1 cime
+17 −0 cime_config/scripts/jenkins_script
+8 −8 cime_config/testmods_dirs/config_pes_tests.xml
+23 −0 cime_config/tests.py
+4 −0 components/data_comps/docn/cime_config/config_component.xml
+55 −15 components/eam/bld/build-namelist
+2 −2 components/eam/bld/configure
+43 −10 components/eam/bld/namelist_files/namelist_defaults_eam.xml
+201 −3 components/eam/bld/namelist_files/namelist_definition.xml
+6 −1 components/eam/bld/namelist_files/use_cases/1850S_E3SMv1_superfast_ar5-emis.xml
+7 −1 components/eam/bld/namelist_files/use_cases/1850_E3SMv1_superfast_ar5-emis.xml
+1 −1 components/eam/bld/namelist_files/use_cases/1850_eam_CMIP6-1pctCO2.xml
+1 −1 components/eam/bld/namelist_files/use_cases/1850_eam_CMIP6.xml
+2 −2 components/eam/bld/namelist_files/use_cases/1850_eam_CMIP6_bgc.xml
+2 −2 components/eam/bld/namelist_files/use_cases/1950_eam_CMIP6.xml
+1 −1 components/eam/bld/namelist_files/use_cases/2010S_cam5_CMIP6.xml
+1 −1 components/eam/bld/namelist_files/use_cases/2010_eam_CMIP6.xml
+1 −1 components/eam/bld/namelist_files/use_cases/2010_mmf_2mom.xml
+1 −1 components/eam/bld/namelist_files/use_cases/2010_scream_hr.xml
+1 −1 components/eam/bld/namelist_files/use_cases/2010_scream_hr_dyamond2.xml
+1 −1 components/eam/bld/namelist_files/use_cases/2010_scream_lr.xml
+1 −1 components/eam/bld/namelist_files/use_cases/2010_scream_lr_dyamond2.xml
+1 −1 components/eam/bld/namelist_files/use_cases/20TRS_E3SMv1_superfast_ar5-emis.xml
+1 −1 components/eam/bld/namelist_files/use_cases/20TR_E3SMv1_superfast_ar5-emis.xml
+1 −1 components/eam/bld/namelist_files/use_cases/20TR_eam_CMIP6.xml
+2 −2 components/eam/bld/namelist_files/use_cases/20TR_eam_CMIP6_bgc.xml
+119 −0 components/eam/bld/namelist_files/use_cases/20TR_eam_chemUCI-Linoz.xml
+282 −0 components/eam/chem_proc/inputs/pp_chemUCI_linozv3_mam4_resus_mom_soag_tag.in
+279 −0 components/eam/chem_proc/inputs/pp_chemUCI_mam4_resus_mom_soag.in
+279 −0 components/eam/chem_proc/inputs/pp_chemUCI_mam4_resus_mom_soag_tag.in
+284 −0 components/eam/chem_proc/inputs/pp_chemUCIfastj_linozv3_mam4_resus_mom_soag_tag.in
+283 −0 components/eam/chem_proc/inputs/pp_chemUCIfastj_mam4_resus_mom_soag.in
+4 −0 components/eam/cime_config/config_component.xml
+20 −0 components/eam/cime_config/config_compsets.xml
+43 −0 components/eam/cime_config/testdefs/testmods_dirs/eam/ne4_v3atm_rtmoff/user_nl_eam
+6 −0 components/eam/cime_config/testdefs/testmods_dirs/eam/ne4_v3atm_rtmoff/user_nl_elm
+7 −0 components/eam/cime_config/testdefs/testmods_dirs/eam/ne4_v3atm_rtmoff/user_nl_mosart
+2 −0 components/eam/cime_config/testdefs/testmods_dirs/eam/p3/shell_commands
+43 −0 components/eam/cime_config/testdefs/testmods_dirs/eam/v3atm_rtmoff/user_nl_eam
+6 −0 components/eam/cime_config/testdefs/testmods_dirs/eam/v3atm_rtmoff/user_nl_elm
+7 −0 components/eam/cime_config/testdefs/testmods_dirs/eam/v3atm_rtmoff/user_nl_mosart
+1,181 −0 components/eam/src/chemistry/mozart/UCI_cld_sub_mod.f90
+647 −0 components/eam/src/chemistry/mozart/UCI_cloudJ_interface.F90
+262 −0 components/eam/src/chemistry/mozart/UCI_fjx_cmn_mod.F90
+1,351 −0 components/eam/src/chemistry/mozart/UCI_fjx_init_mod.f90
+2,994 −0 components/eam/src/chemistry/mozart/UCI_fjx_sub_mod.f90
+655 −0 components/eam/src/chemistry/mozart/UCI_osa_sub_mod.f90
+214 −14 components/eam/src/chemistry/mozart/chemistry.F90
+821 −131 components/eam/src/chemistry/mozart/lin_strat_chem.F90
+134 −30 components/eam/src/chemistry/mozart/linoz_data.F90
+190 −15 components/eam/src/chemistry/mozart/llnl_O1D_to_2OH_adj.F90
+6 −1 components/eam/src/chemistry/mozart/mo_chemini.F90
+864 −61 components/eam/src/chemistry/mozart/mo_chm_diags.F90
+10 −0 components/eam/src/chemistry/mozart/mo_drydep.F90
+47 −5 components/eam/src/chemistry/mozart/mo_exp_sol.F90
+4 −4 components/eam/src/chemistry/mozart/mo_fstrat.F90
+828 −55 components/eam/src/chemistry/mozart/mo_gas_phase_chemdr.F90
+191 −248 components/eam/src/chemistry/mozart/mo_neu_wetdep.F90
+16 −6 components/eam/src/chemistry/mozart/mo_photo.F90
+10 −3 components/eam/src/chemistry/mozart/mo_setinv.F90
+23 −4 components/eam/src/chemistry/mozart/mo_usrrxt.F90
+108 −6 components/eam/src/chemistry/mozart/rate_diags.F90
+74 −0 components/eam/src/chemistry/pp_superfast_mam4_resus_mom_soag/FJX_j2j_superfast.dat
+8 −4 components/eam/src/physics/cam/cloud_diagnostics.F90
+5 −10 components/eam/src/physics/cam/microp_driver.F90
+101 −4 components/eam/src/physics/cam/phys_control.F90
+38 −2 components/eam/src/physics/cam/physpkg.F90
+6 −4 components/eam/src/physics/cam/radiation_data.F90
+288 −123 components/eam/src/physics/cam/tropopause.F90
+1 −0 components/eam/src/physics/cam/wv_sat_scream.F90
+4,317 −1 components/eam/src/physics/p3/eam/micro_p3.F90
+1,277 −1 components/eam/src/physics/p3/eam/micro_p3_interface.F90
+168 −10 components/eam/src/physics/p3/eam/micro_p3_utils.F90
+13 −2 components/elm/src/biogeochem/DryDepVelocity.F90
+0 −8 components/mpas-ocean/src/Registry.xml
+0 −7 components/mpas-ocean/src/shared/mpas_ocn_vel_tidal_potential.F
+1 −0 components/mpas-seaice/bld/build-namelist
+1 −0 components/mpas-seaice/bld/build-namelist-section
+1 −0 components/mpas-seaice/bld/namelist_files/namelist_defaults_mpassi.xml
+11 −3 components/mpas-seaice/bld/namelist_files/namelist_definition_mpassi.xml
+7 −0 components/mpas-seaice/cime_config/buildnml
+69 −3 components/mpas-seaice/src/Registry.xml
+16 −0 components/mpas-seaice/src/shared/mpas_seaice_constants.F
+926 −62 components/mpas-seaice/src/shared/mpas_seaice_forcing.F
+170 −0 components/mpas-seaice/src/shared/mpas_seaice_initialize.F
20 changes: 11 additions & 9 deletions utils/e3sm_update/test_e3sm_changes.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ def submit_e3sm_tests(submodule, repo_url, ocean_strings, landice_strings,
setup_worktree(submodule, worktree=new_submodule, hash=new)

# get a list of merges between the current and new hashes
commands = f'cd {new_submodule}; ' \
commands = f'cd {new_submodule} && ' \
f'git log --oneline --first-parent --ancestry-path ' \
f'{current}..{new}'

Expand Down Expand Up @@ -156,19 +156,20 @@ def submit_e3sm_tests(submodule, repo_url, ocean_strings, landice_strings,

def setup_worktree(submodule, worktree, hash):
if not os.path.exists(worktree):
commands = f'cd {submodule}; ' \
commands = f'cd {submodule} && ' \
f'git worktree add ../{worktree}'
print_and_run(commands)

commands = f'cd {worktree}; ' \
f'git reset --hard {hash}; ' \
commands = f'cd {worktree} && ' \
f'git reset --hard {hash} && ' \
f'git submodule update --init --recursive >& submodule.log'
print_and_run(commands)


def build_model(load_script, worktree, mpas_subdir, make_command):
commands = f'source {load_script}; ' \
f'cd {worktree}/{mpas_subdir}; ' \
commands = f'export NO_COMPASS_REINSTALL=true && ' \
f'source {load_script} && ' \
f'cd {worktree}/{mpas_subdir} && ' \
f'{make_command} &> make.log'
print_and_run(commands)

Expand All @@ -191,18 +192,19 @@ def setup_and_submit(load_script, setup_command, worktree, mpas_subdir,
if baseline is not None:
full_setup = f'{full_setup} -b {baseline}'

commands = f'source {load_script}; ' \
commands = f'export NO_COMPASS_REINSTALL=true && ' \
f'source {load_script} && ' \
f'{full_setup}'
print_and_run(commands)

commands = f'cd {workdir}; ' \
commands = f'cd {workdir} && ' \
f'sbatch job_script.{suite}.sh'
print_and_run(commands)


def print_and_run(commands, get_output=False):
print('\nRunning:')
print_commands = commands.replace('; ', '\n ')
print_commands = commands.replace(' && ', '\n ')
print(f' {print_commands}\n\n')
if get_output:
output = subprocess.check_output(commands, shell=True)
Expand Down