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.

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

Jump to bottom

cam6_3_016: Refactor coupling with WACCMX ionosphere #264

Merged
merged 40 commits into from
Apr 1, 2021
Merged

cam6_3_016: Refactor coupling with WACCMX ionosphere #264

merged 40 commits into from
Apr 1, 2021

Commits on Oct 27, 2020

  1. merge origin/phys-ionos-cpl

    @fvitt
    fvitt committed Oct 27, 2020
    Configuration menu
    Copy the full SHA
    7936f44 View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2020

  1. revert changes in SE dycore; adjust testing 

            deleted:    cime_config/testdefs/testmods_dirs/cam/outfrq3s_WX81/shell_commands
        deleted:    cime_config/testdefs/testmods_dirs/cam/outfrq3s_WX81/user_nl_cam
        deleted:    cime_config/testdefs/testmods_dirs/cam/outfrq3s_WX81/user_nl_clm
        modified:   cime_config/testdefs/testmods_dirs/cam/outfrq9s_576tsks/user_nl_clm
        modified:   cime_config/config_pes.xml
        modified:   cime_config/testdefs/testlist_cam.xml
        modified:   src/dynamics/se/dp_coupling.F90
        modified:   src/dynamics/se/dycore/dimensions_mod.F90
        modified:   src/dynamics/se/dycore/global_norms_mod.F90
        modified:   src/dynamics/se/dycore/prim_advance_mod.F90
        modified:   src/dynamics/se/dyn_comp.F90
        modified:   src/dynamics/se/stepon.F90
    @fvitt
    fvitt committed Oct 28, 2020
    Configuration menu
    Copy the full SHA
    fcb1fc9 View commit details
    Browse the repository at this point in the history

  2. remove wxie offline driver; revert changes to set Te in pbuf at begin… 

    …ning of each time step; misc cleanup

        deleted:    src/unit_drivers/wxie/unit_driver.F90
        modified:   bld/config_files/definition.xml
        modified:   bld/configure
        modified:   cime_config/testdefs/testlist_cam.xml
        modified:   src/physics/cam/physpkg.F90
        modified:   src/physics/cam/rk_stratiform.F90
        modified:   src/physics/cam/waccmx_phys_intr.F90
        modified:   src/physics/waccmx/ion_electron_temp.F90
        modified:   src/unit_drivers/drv_input_data.F90
    @fvitt
    fvitt committed Oct 28, 2020
    Configuration menu
    Copy the full SHA
    4f0e1cb View commit details
    Browse the repository at this point in the history

  3. revert bug fixes 

            modified:   src/chemistry/mozart/mo_apex.F90
        modified:   src/utils/physconst.F90
    @fvitt
    fvitt committed Oct 28, 2020
    Configuration menu
    Copy the full SHA
    495715e View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2020

  1. revert waccm namelist setteings; tweak waccmx nag test 

            modified:   bld/namelist_files/namelist_defaults_cam.xml
        modified:   cime_config/testdefs/testlist_cam.xml
    @fvitt
    fvitt committed Oct 29, 2020
    Configuration menu
    Copy the full SHA
    d5c048c View commit details
    Browse the repository at this point in the history

  2. set se_molecular_diff=0.0 for waccmx 

            modified:   bld/namelist_files/namelist_defaults_cam.xml
    @fvitt
    fvitt committed Oct 29, 2020
    Configuration menu
    Copy the full SHA
    75cb5a2 View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2020

  1. remove unused namelist options 

            modified:   bld/build-namelist
        modified:   bld/namelist_files/namelist_defaults_cam.xml
        modified:   cime_config/testdefs/testlist_cam.xml
        modified:   doc/ChangeLog
        modified:   src/ionosphere/waccmx/ionosphere_interface.F90
    @fvitt
    fvitt committed Oct 30, 2020
    Configuration menu
    Copy the full SHA
    9171bbd View commit details
    Browse the repository at this point in the history

  2. tweaks to testlist 

            modified:   cime_config/testdefs/testlist_cam.xml
        deleted:    cime_config/testdefs/testmods_dirs/cam/outfrq3s_waccm_ma/shell_commands
        deleted:    cime_config/testdefs/testmods_dirs/cam/outfrq3s_waccm_ma/user_nl_cam
        new file:   cime_config/testdefs/testmods_dirs/cam/outfrq9s_multi/shell_commands
        new file:   cime_config/testdefs/testmods_dirs/cam/outfrq9s_multi/user_nl_cam
        renamed:    cime_config/testdefs/testmods_dirs/cam/outfrq3s_waccm_ma/user_nl_clm -> cime_config/testdefs/testmods_dirs/cam/outfrq9s_multi/user_nl_clm
    @fvitt
    fvitt committed Oct 30, 2020
    Configuration menu
    Copy the full SHA
    e1fffd3 View commit details
    Browse the repository at this point in the history

Commits on Nov 18, 2020

  1. set default mag grid resolution according to physics grid resolution 

            modified:   bld/configure
    @fvitt
    fvitt committed Nov 18, 2020
    Configuration menu
    Copy the full SHA
    16f46b1 View commit details
    Browse the repository at this point in the history

Commits on Dec 28, 2020

  1. remove wxi ionosphere match from build-namelist

    @fvitt
    fvitt committed Dec 28, 2020
    Configuration menu
    Copy the full SHA
    3593107 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'phys-ionos-cpl_cam6_3_002' of https://github.com/fvitt/CAM 

     into phys-ionos-cpl_cam6_3_002
    @fvitt
    fvitt committed Dec 28, 2020
    Configuration menu
    Copy the full SHA
    fd89794 View commit details
    Browse the repository at this point in the history

Commits on Dec 29, 2020

  1. misc clean up 

            modified:   src/ionosphere/waccmx/edyn_geogrid.F90
        modified:   src/ionosphere/waccmx/edyn_grid_comp.F90
        modified:   src/ionosphere/waccmx/regridder.F90
    @fvitt
    fvitt committed Dec 29, 2020
    Configuration menu
    Copy the full SHA
    806ea4e View commit details
    Browse the repository at this point in the history

Commits on Dec 30, 2020

  1. use accurate (at poles) mesh files 

            modified:   bld/namelist_files/namelist_defaults_cam.xml
        modified:   cime_config/testdefs/testmods_dirs/cam/outfrq9s_576tsks/shell_commands
        modified:   src/ionosphere/waccmx/edyn_grid_comp.F90
    @fvitt
    fvitt committed Dec 30, 2020
    Configuration menu
    Copy the full SHA
    0985024 View commit details
    Browse the repository at this point in the history

  2. remove WACCMX_EDYN_ESMF cpp var 

            modified:   bld/configure
        modified:   src/ionosphere/waccmx/amie_module.F90
        modified:   src/ionosphere/waccmx/edyn_esmf.F90
        modified:   src/ionosphere/waccmx/edyn_init.F90
        modified:   src/ionosphere/waccmx/edynamo.F90
        modified:   src/ionosphere/waccmx/ionosphere_interface.F90
        modified:   src/ionosphere/waccmx/ltr_module.F90
        modified:   src/ionosphere/waccmx/utils_mod.F90
    @fvitt
    fvitt committed Dec 30, 2020
    Configuration menu
    Copy the full SHA
    b11d075 View commit details
    Browse the repository at this point in the history

  3. correct mgrid config opt in 576tsks test

    @fvitt
    fvitt committed Dec 30, 2020
    Configuration menu
    Copy the full SHA
    4415d6e View commit details
    Browse the repository at this point in the history

Commits on Dec 31, 2020

  1. clean up per some of nusbaume's suggestions 

            modified:   bld/configure
        modified:   src/ionosphere/waccmx/adotv_mod.F90
        modified:   src/ionosphere/waccmx/amie_module.F90
        modified:   src/ionosphere/waccmx/dpie_coupling.F90
        modified:   src/ionosphere/waccmx/edyn_init.F90
        modified:   src/ionosphere/waccmx/edyn_params.F90
        modified:   src/ionosphere/waccmx/ionosphere_interface.F90
        modified:   src/ionosphere/waccmx/ltr_module.F90
        modified:   src/ionosphere/waccmx/utils_mod.F90
        modified:   src/physics/cam/cam_diagnostics.F90
        modified:   src/physics/cam/phys_control.F90
   These are reverted to earlier version:
        modified:   bld/namelist_files/namelist_defaults_cam.xml
        modified:   src/ionosphere/waccmx/edyn_grid_comp.F90
    @fvitt
    fvitt committed Dec 31, 2020
    Configuration menu
    Copy the full SHA
    29ad309 View commit details
    Browse the repository at this point in the history

  2. use correct grid for mag field diags; write to iulog 

            modified:   src/ionosphere/waccmx/edyn_grid_comp.F90
        modified:   src/ionosphere/waccmx/edyn_init.F90
    @fvitt
    fvitt committed Dec 31, 2020
    Configuration menu
    Copy the full SHA
    62b4757 View commit details
    Browse the repository at this point in the history

Commits on Jan 4, 2021

  1. more clean up 

            modified:   src/ionosphere/waccmx/edyn_esmf.F90
        modified:   src/ionosphere/waccmx/edyn_geogrid.F90
        modified:   src/ionosphere/waccmx/edyn_grid_comp.F90
        modified:   src/ionosphere/waccmx/edyn_mpi.F90
        modified:   src/ionosphere/waccmx/edynamo.F90
        modified:   src/ionosphere/waccmx/wei05sc.F90
    @fvitt
    fvitt committed Jan 4, 2021
    Configuration menu
    Copy the full SHA
    5015ced View commit details
    Browse the repository at this point in the history

  2. remove dead code from getapex 

            modified:   src/ionosphere/waccmx/getapex.F90
    @fvitt
    fvitt committed Jan 4, 2021
    Configuration menu
    Copy the full SHA
    c254daa View commit details
    Browse the repository at this point in the history

Commits on Jan 5, 2021

  1. update ChangeLog

    @fvitt
    fvitt committed Jan 5, 2021
    Configuration menu
    Copy the full SHA
    edfab5e View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2021

  1. clean up per some of nusbaume's second round of review 

            modified:   cime_config/testdefs/testlist_cam.xml
        modified:   cime_config/testdefs/testmods_dirs/cam/outfrq9s_ltr/user_nl_cam
        modified:   src/ionosphere/waccmx/amie_module.F90
        modified:   src/ionosphere/waccmx/dpie_coupling.F90
        modified:   src/ionosphere/waccmx/edyn_esmf.F90
        modified:   src/ionosphere/waccmx/edyn_grid_comp.F90
        modified:   src/ionosphere/waccmx/edyn_mpi.F90
        modified:   src/ionosphere/waccmx/edyn_mudmod.F90
        modified:   src/ionosphere/waccmx/edynamo.F90
        modified:   src/ionosphere/waccmx/ionosphere_interface.F90
        modified:   src/ionosphere/waccmx/ltr_module.F90
        modified:   src/ionosphere/waccmx/utils_mod.F90
        modified:   src/ionosphere/waccmx/wei05sc.F90
    @fvitt
    fvitt committed Mar 2, 2021
    Configuration menu
    Copy the full SHA
    86afcf6 View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2021

  1. merge ESCOMP/cam_development

    @fvitt
    fvitt committed Mar 3, 2021
    Configuration menu
    Copy the full SHA
    f79929e View commit details
    Browse the repository at this point in the history

  2. add _r8 to constants in oplus.F90

    @fvitt
    fvitt committed Mar 3, 2021
    Configuration menu
    Copy the full SHA
    898695a View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2021

  1. nag compiler fixes

    @fvitt
    fvitt committed Mar 5, 2021
    Configuration menu
    Copy the full SHA
    bf509c7 View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2021

  1. update netcdf format of mesh files; increase num of cheyenne cores fo… 

    …r f19 res; correct path for fsurdat file in test

        modified:   bld/namelist_files/namelist_defaults_cam.xml
        modified:   cime_config/config_pes.xml
        modified:   cime_config/testdefs/testmods_dirs/cam/outfrq9s_576tsks/user_nl_clm
    @fvitt
    fvitt committed Mar 8, 2021
    Configuration menu
    Copy the full SHA
    4cf9f30 View commit details
    Browse the repository at this point in the history

  2. changes per code review by cacraigucar 

            modified:   src/ionosphere/waccmx/edyn_geogrid.F90
        modified:   src/ionosphere/waccmx/edyn_grid_comp.F90
        modified:   src/ionosphere/waccmx/oplus.F90
        modified:   src/ionosphere/waccmx/wei05sc.F90
    @fvitt
    fvitt committed Mar 8, 2021
    Configuration menu
    Copy the full SHA
    fad5370 View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2021

  1. Increase MPI buffer parameter 

            modified:   src/ionosphere/waccmx/edyn_mpi.F90
    @fvitt
    fvitt committed Mar 26, 2021
    Configuration menu
    Copy the full SHA
    47f41d4 View commit details
    Browse the repository at this point in the history

  2. make mag grid resolution run-time configurable 

            modified:   bld/build-namelist
        modified:   bld/config_files/definition.xml
        modified:   bld/configure
        modified:   bld/namelist_files/namelist_defaults_cam.xml
        modified:   bld/namelist_files/namelist_definition.xml
        modified:   src/chemistry/mozart/short_lived_species.F90
        modified:   src/ionosphere/waccmx/edyn_init.F90
        modified:   src/ionosphere/waccmx/edyn_maggrid.F90
        modified:   src/ionosphere/waccmx/edyn_mud.F90
        modified:   src/ionosphere/waccmx/edyn_mudmod.F90
        modified:   src/ionosphere/waccmx/edyn_muh2cr.F90
        modified:   src/ionosphere/waccmx/edyn_solve.F90
        modified:   src/ionosphere/waccmx/edynamo.F90
        modified:   src/ionosphere/waccmx/getapex.F90
        modified:   src/ionosphere/waccmx/ionosphere_interface.F90
        modified:   src/ionosphere/waccmx/wei05sc.F90
    @fvitt
    fvitt committed Mar 26, 2021
    Configuration menu
    Copy the full SHA
    c948516 View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2021

  1. eliminate some nag compiler warnings 

            modified:   src/chemistry/mozart/short_lived_species.F90
        modified:   src/ionosphere/waccmx/edyn_geogrid.F90
        modified:   src/ionosphere/waccmx/edyn_init.F90
        modified:   src/ionosphere/waccmx/edyn_mud.F90
        modified:   src/ionosphere/waccmx/edyn_mudmod.F90
        modified:   src/ionosphere/waccmx/edyn_muh2cr.F90
        modified:   src/ionosphere/waccmx/edyn_solve.F90
        modified:   src/ionosphere/waccmx/getapex.F90
        modified:   src/ionosphere/waccmx/ionosphere_interface.F90
    @fvitt
    fvitt committed Mar 27, 2021
    Configuration menu
    Copy the full SHA
    9eb15d0 View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2021

  1. support for nuopc threading

    @jedwards4b
    jedwards4b committed Mar 29, 2021
    Configuration menu
    Copy the full SHA
    000f19e View commit details
    Browse the repository at this point in the history

  2. clean up

    @jedwards4b
    jedwards4b committed Mar 29, 2021
    Configuration menu
    Copy the full SHA
    0dd4987 View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2021

  1. changes per gold2718's code review 

            modified:   src/ionosphere/waccmx/edyn_grid_comp.F90
        modified:   src/ionosphere/waccmx/edyn_mpi.F90
        modified:   src/ionosphere/waccmx/edyn_mud.F90
        modified:   src/ionosphere/waccmx/edyn_mudcom.F90
        modified:   src/ionosphere/waccmx/edyn_mudmod.F90
        modified:   src/ionosphere/waccmx/edyn_muh2cr.F90
        modified:   src/ionosphere/waccmx/edyn_solve.F90
        new file:   src/ionosphere/waccmx/edyn_solver_coefs.F90
    @fvitt
    fvitt committed Mar 30, 2021
    Configuration menu
    Copy the full SHA
    8e0d2d1 View commit details
    Browse the repository at this point in the history

  2. more nag changes 

            modified:   src/ionosphere/waccmx/edyn_mudcom.F90
    @fvitt
    fvitt committed Mar 30, 2021
    Configuration menu
    Copy the full SHA
    98594ca View commit details
    Browse the repository at this point in the history

  3. move multi-inst test to prealpha

    @fvitt
    fvitt committed Mar 30, 2021
    Configuration menu
    Copy the full SHA
    45515f1 View commit details
    Browse the repository at this point in the history

Commits on Mar 31, 2021

  1. merge to head of cam_development

    @fvitt
    fvitt committed Mar 31, 2021
    Configuration menu
    Copy the full SHA
    dd6fdfc View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'jedwards4b/nuopc_threading' into phys-i… 

    …onos-cpl_cam6_3_002
    @fvitt
    fvitt committed Mar 31, 2021
    Configuration menu
    Copy the full SHA
    5a5e2b7 View commit details
    Browse the repository at this point in the history

  3. remove erroneous mgrid configure option from outfrq9s_576tsks test mod

    @fvitt
    fvitt committed Mar 31, 2021
    Configuration menu
    Copy the full SHA
    0dff441 View commit details
    Browse the repository at this point in the history

  4. remvove extra slow aux_cam test ERC_Ln9.f45_f45_mg37.QPC4X.izumi_pgi

    @fvitt
    fvitt committed Mar 31, 2021
    Configuration menu
    Copy the full SHA
    e70b159 View commit details
    Browse the repository at this point in the history

  5. ChangeLog draft

    @fvitt
    fvitt committed Mar 31, 2021
    Configuration menu
    Copy the full SHA
    a68412e View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2021

  1. update ChangeLog

    @fvitt
    fvitt committed Apr 1, 2021
    Configuration menu
    Copy the full SHA
    765d0d3 View commit details
    Browse the repository at this point in the history