|
1 | 1 | =============================================================== |
| 2 | + |
| 3 | +Tag name: |
| 4 | +Originator(s): eaton |
| 5 | +Date: |
| 6 | +One-line Summary: Add QPLT and QPMT compsets, plus misc. |
| 7 | +Github PR URL: https://github.com/ESCOMP/CAM/pull/1203 |
| 8 | + |
| 9 | +Purpose of changes (include the issue number and title text for each relevant GitHub issue): |
| 10 | + |
| 11 | +Issue #814 - Introduce QPC7 and possibly QPS7 aquaplanet compsets |
| 12 | + - Analogous to FLT and FMT compset names, create QPLT and QPMT compsets. |
| 13 | + - Open new issue to address QPS7. |
| 14 | + - The new aquaplanet configurations use '-chem none' to eliminate the |
| 15 | + aerosols. This is much faster and requires much less memory than a |
| 16 | + configuration that leaves the default chemistry in place and removes |
| 17 | + aerosols by zeroing the initial concentrations and emission sources. |
| 18 | + |
| 19 | +Issue #1159 - Prealpha tests exceeding wallclock |
| 20 | + - increased time limit to 20 minutes for these prealpha tests: |
| 21 | + ERP_Ln9.f09_f09_mg17.FHIST_BGC.derecho_intel.cam-outfrq9s |
| 22 | + ERP_Ln9.f09_f09_mg17.FHIST.derecho_intel.cam-outfrq9s |
| 23 | + |
| 24 | +Issue #670 - DAE test broken |
| 25 | + - ChangeLog indicates that this test has never worked since it was added |
| 26 | + in cam6_2_046 (2020-09-01). Test removed. |
| 27 | + |
| 28 | +Issue #807 - add UT and UQ to cam_diagnostics |
| 29 | + - Add UT and UQ. Note that other possible fields mentioned in the issue, |
| 30 | + i.e., OMEGA2, OMEGAQ, OMEGAU, and OMEGAV, are already implemented. |
| 31 | + OMEGA2 is called OMGAOMGA. |
| 32 | + |
| 33 | +Describe any changes made to build system: none |
| 34 | + |
| 35 | +Describe any changes made to the namelist: none |
| 36 | + |
| 37 | +List any changes to the defaults for the boundary datasets: |
| 38 | +. add spun up initial files for QPLT compset on ne3pg3 and ne30pg3 grids. |
| 39 | + atm/cam/inic/se/QPLT_L58_ne3pg3_c241127.nc |
| 40 | + atm/cam/inic/se/QPLT_L58_ne30pg3_c241127.nc |
| 41 | + |
| 42 | +. add spun up initial files for QPMT compset on ne3pg3 and ne30pg3 grids. |
| 43 | + atm/cam/inic/se/QPMT_L93_ne3pg3_c241223.nc |
| 44 | + atm/cam/inic/se/QPMT_L93_ne30pg3_c241223.nc |
| 45 | + |
| 46 | +. add ozone dataset for high top aquaplanet runs |
| 47 | + atm/cam/ozone/aquaplanet_ozone_hightop_c20180412.nc |
| 48 | + |
| 49 | +Describe any substantial timing or memory changes: n/a |
| 50 | + |
| 51 | +Code reviewed by: |
| 52 | + |
| 53 | +List all files eliminated: |
| 54 | + |
| 55 | +cime_config/testdefs/testmods_dirs/cam/dae/shell_commands |
| 56 | +cime_config/testdefs/testmods_dirs/cam/dae/user_nl_cam |
| 57 | +cime_config/testdefs/testmods_dirs/cam/dae/user_nl_cpl |
| 58 | +test/system/da_cam_no_data_mod.sh |
| 59 | +. DAE test removed |
| 60 | + |
| 61 | +List all files added and what they do: none |
| 62 | + |
| 63 | +List all existing files that have been modified, and describe the changes: |
| 64 | + |
| 65 | +bld/namelist_files/namelist_defaults_cam.xml |
| 66 | +. replace current entry for ne3np4 L58 aquaplanet with |
| 67 | + QPLT_L58_ne3pg3_c241127.nc. |
| 68 | +. add new file for ne30np4 L58 aquaplanet. |
| 69 | + |
| 70 | +bld/namelist_files/use_cases/aquaplanet_cam7.xml |
| 71 | +. use case file for QPLT and QPMT. Same as for QPC6 except: |
| 72 | + - set f11vmr=f12vmr=0 to override the non-zero default values from |
| 73 | + namelist_defaults_cam.xml. |
| 74 | + - set prescribed_aero_file="" and prescribed_aero_specifier="" to |
| 75 | + override the default bulk aerosol settings from build-namelist. |
| 76 | + - set rad_climate to just make the GHGs radiatively active to override |
| 77 | + the default build-namelist setting which includes bulk aerosols. |
| 78 | + - Add spun-up IC files. This allows us to remove the ic_ymd attribute |
| 79 | + which should not be needed for aquaplanet runs. Removing ic_ymd |
| 80 | + enables testing with arbitrary start dates. |
| 81 | + - Add ozone dataset for high top aquaplanet configuration |
| 82 | + |
| 83 | +cime_config/config_component.xml |
| 84 | +. CAM_CONFIG_OPTS |
| 85 | + - add match for _CAM70.*_SLND_SICE_DOCN%AQP to set '-chem none' |
| 86 | +. CAM_NML_USE_CASE |
| 87 | + - add match for 2000_CAM70.*_SLND_SICE_DOCN%AQP to use aquaplanet_cam7. |
| 88 | + This match will work for both %LT and %MT configs. |
| 89 | + |
| 90 | +cime_config/config_compsets.xml |
| 91 | +. add QPLT = 2000_CAM70%LT_SLND_SICE_DOCN%AQP3_SROF_SGLC_SWAV |
| 92 | +. add QPMT = 2000_CAM70%MT_SLND_SICE_DOCN%AQP3_SROF_SGLC_SWAV |
| 93 | + |
| 94 | +cime_config/testdefs/testlist_cam.xml |
| 95 | +. increase time limit to 20 minutes for these prealpha tests: |
| 96 | + ERP_Ln9.f09_f09_mg17.FHIST_BGC.derecho_intel.cam-outfrq9s |
| 97 | + ERP_Ln9.f09_f09_mg17.FHIST.derecho_intel.cam-outfrq9s |
| 98 | +. remove non-working DAE test |
| 99 | +. replace ERP_D_Ln9.f19_f19_mg17.QPC6.derecho_intel.cam-outfrq9s |
| 100 | + by ERP_D_Ln9.ne30pg3_ne30pg3_mg17.QPLT.derecho_intel.cam-outfrq3s_cosp |
| 101 | +. Add ERP_D_Ln9.ne30pg3_ne30pg3_mg17.QPMT.derecho_intel.cam-outfrq3s |
| 102 | +. replace ERP_D_Ln9.ne3pg3_ne3pg3_mg37.QPC6.izumi_gnu.cam-outfrq9s_rrtmgp |
| 103 | + by ERP_D_Ln9.ne3pg3_ne3pg3_mg37.QPLT.izumi_gnu.cam-outfrq9s |
| 104 | +. Add ERP_D_Ln9.ne3pg3_ne3pg3_mg37.QPMT.izumi_gnu.cam-outfrq9s |
| 105 | + |
| 106 | +cime_config/testdefs/testmods_dirs/cam/outfrq3s_cosp/shell_commands |
| 107 | +. remove "./xmlchange CAM_NML_USE_CASE=UNSET" |
| 108 | + |
| 109 | +cime_config/testdefs/testmods_dirs/cam/outfrq3s_cosp/user_nl_cam |
| 110 | +. add CS_SNOWCERT and CS_SNOWPOSS to fexcl1 |
| 111 | + |
| 112 | +src/chemistry/mozart/mo_drydep.F90 |
| 113 | +. get_landuse_and_soilw_from_file |
| 114 | + - restrict the INFO messages to only print from masterproc |
| 115 | + |
| 116 | +src/physics/cam/cam_diagnostics.F90 |
| 117 | +. diag_init_dry |
| 118 | + - add addfld call for UT, and corresponding add_default for UT inside the |
| 119 | + history_eddy conditional. |
| 120 | +. diag_phys_writeout_dry |
| 121 | + - add calculation and outfld call for UT |
| 122 | +. diag_init_moist |
| 123 | + - add addfld call for UQ, and corresponding add_default for UQ inside the |
| 124 | + history_eddy conditional. |
| 125 | +. diag_phys_writeout_moist |
| 126 | + - add calculation and outfld call for UQ |
| 127 | + |
| 128 | +src/physics/cam/microp_aero.F90 |
| 129 | +. microp_aero_run |
| 130 | + - add condition that number of bulk aerosols must be > 0 before calling |
| 131 | + ndrop_bam_run. |
| 132 | + |
| 133 | +src/physics/cam/nucleate_ice_cam.F90 |
| 134 | +. nucleate_ice_cam_calc |
| 135 | + - add conditionals so naer2 array not referenced when there are no |
| 136 | + aerosols. |
| 137 | + |
| 138 | +src/physics/cam/vertical_diffusion.F90 |
| 139 | +. vertical_diffusion_init |
| 140 | + - fix conditional around add_default call for UFLX and VFLX so those |
| 141 | + fields aren't added if they're not computed. |
| 142 | + |
| 143 | +src/physics/cam7/physpkg.F90 |
| 144 | +. tphysbc |
| 145 | + - add conditionals so modal aerosol calculations only called when modal |
| 146 | + aerosols are present. |
| 147 | + |
| 148 | +If there were any failures reported from running test_driver.sh on any test |
| 149 | +platform, and checkin with these failures has been OK'd by the gatekeeper, |
| 150 | +then copy the lines from the td.*.status files for the failed tests to the |
| 151 | +appropriate machine below. All failed tests must be justified. |
| 152 | + |
| 153 | +derecho/intel/aux_cam: |
| 154 | + |
| 155 | +derecho/nvhpc/aux_cam: |
| 156 | + |
| 157 | +izumi/nag/aux_cam: |
| 158 | + |
| 159 | +izumi/gnu/aux_cam: |
| 160 | + |
| 161 | +CAM tag used for the baseline comparison tests if different than previous |
| 162 | +tag: |
| 163 | + |
| 164 | +Summarize any changes to answers: |
| 165 | + |
| 166 | +=============================================================== |
| 167 | +=============================================================== |
2 | 168 | Tag name: cam6_4_050 |
3 | 169 | Originator(s): jimmielin |
4 | 170 | Date: 31 Dec 2024 |
@@ -521,172 +687,6 @@ this tag and confirmed that there were no DIFFs |
521 | 687 |
|
522 | 688 | =============================================================== |
523 | 689 |
|
524 | | -Tag name: |
525 | | -Originator(s): eaton |
526 | | -Date: |
527 | | -One-line Summary: Add QPLT and QPMT compsets, plus misc. |
528 | | -Github PR URL: https://github.com/ESCOMP/CAM/pull/1203 |
529 | | - |
530 | | -Purpose of changes (include the issue number and title text for each relevant GitHub issue): |
531 | | - |
532 | | -Issue #814 - Introduce QPC7 and possibly QPS7 aquaplanet compsets |
533 | | - - Analogous to FLT and FMT compset names, create QPLT and QPMT compsets. |
534 | | - - Open new issue to address QPS7. |
535 | | - - The new aquaplanet configurations use '-chem none' to eliminate the |
536 | | - aerosols. This is much faster and requires much less memory than a |
537 | | - configuration that leaves the default chemistry in place and removes |
538 | | - aerosols by zeroing the initial concentrations and emission sources. |
539 | | - |
540 | | -Issue #1159 - Prealpha tests exceeding wallclock |
541 | | - - increased time limit to 20 minutes for these prealpha tests: |
542 | | - ERP_Ln9.f09_f09_mg17.FHIST_BGC.derecho_intel.cam-outfrq9s |
543 | | - ERP_Ln9.f09_f09_mg17.FHIST.derecho_intel.cam-outfrq9s |
544 | | - |
545 | | -Issue #670 - DAE test broken |
546 | | - - ChangeLog indicates that this test has never worked since it was added |
547 | | - in cam6_2_046 (2020-09-01). Test removed. |
548 | | - |
549 | | -Issue #807 - add UT and UQ to cam_diagnostics |
550 | | - - Add UT and UQ. Note that other possible fields mentioned in the issue, |
551 | | - i.e., OMEGA2, OMEGAQ, OMEGAU, and OMEGAV, are already implemented. |
552 | | - OMEGA2 is called OMGAOMGA. |
553 | | - |
554 | | -Describe any changes made to build system: none |
555 | | - |
556 | | -Describe any changes made to the namelist: none |
557 | | - |
558 | | -List any changes to the defaults for the boundary datasets: |
559 | | -. add spun up initial files for QPLT compset on ne3pg3 and ne30pg3 grids. |
560 | | - atm/cam/inic/se/QPLT_L58_ne3pg3_c241127.nc |
561 | | - atm/cam/inic/se/QPLT_L58_ne30pg3_c241127.nc |
562 | | - |
563 | | -. add spun up initial files for QPMT compset on ne3pg3 and ne30pg3 grids. |
564 | | - atm/cam/inic/se/QPMT_L93_ne3pg3_c241223.nc |
565 | | - atm/cam/inic/se/QPMT_L93_ne30pg3_c241223.nc |
566 | | - |
567 | | -. add ozone dataset for high top aquaplanet runs |
568 | | - atm/cam/ozone/aquaplanet_ozone_hightop_c20180412.nc |
569 | | - |
570 | | -Describe any substantial timing or memory changes: n/a |
571 | | - |
572 | | -Code reviewed by: |
573 | | - |
574 | | -List all files eliminated: |
575 | | - |
576 | | -cime_config/testdefs/testmods_dirs/cam/dae/shell_commands |
577 | | -cime_config/testdefs/testmods_dirs/cam/dae/user_nl_cam |
578 | | -cime_config/testdefs/testmods_dirs/cam/dae/user_nl_cpl |
579 | | -test/system/da_cam_no_data_mod.sh |
580 | | -. DAE test removed |
581 | | - |
582 | | -List all files added and what they do: none |
583 | | - |
584 | | -List all existing files that have been modified, and describe the changes: |
585 | | - |
586 | | -bld/namelist_files/namelist_defaults_cam.xml |
587 | | -. replace current entry for ne3np4 L58 aquaplanet with |
588 | | - QPLT_L58_ne3pg3_c241127.nc. |
589 | | -. add new file for ne30np4 L58 aquaplanet. |
590 | | - |
591 | | -bld/namelist_files/use_cases/aquaplanet_cam7.xml |
592 | | -. use case file for QPLT and QPMT. Same as for QPC6 except: |
593 | | - - set f11vmr=f12vmr=0 to override the non-zero default values from |
594 | | - namelist_defaults_cam.xml. |
595 | | - - set prescribed_aero_file="" and prescribed_aero_specifier="" to |
596 | | - override the default bulk aerosol settings from build-namelist. |
597 | | - - set rad_climate to just make the GHGs radiatively active to override |
598 | | - the default build-namelist setting which includes bulk aerosols. |
599 | | - - Add spun-up IC files. This allows us to remove the ic_ymd attribute |
600 | | - which should not be needed for aquaplanet runs. Removing ic_ymd |
601 | | - enables testing with arbitrary start dates. |
602 | | - - Add ozone dataset for high top aquaplanet configuration |
603 | | - |
604 | | -cime_config/config_component.xml |
605 | | -. CAM_CONFIG_OPTS |
606 | | - - add match for _CAM70.*_SLND_SICE_DOCN%AQP to set '-chem none' |
607 | | -. CAM_NML_USE_CASE |
608 | | - - add match for 2000_CAM70.*_SLND_SICE_DOCN%AQP to use aquaplanet_cam7. |
609 | | - This match will work for both %LT and %MT configs. |
610 | | - |
611 | | -cime_config/config_compsets.xml |
612 | | -. add QPLT = 2000_CAM70%LT_SLND_SICE_DOCN%AQP3_SROF_SGLC_SWAV |
613 | | -. add QPMT = 2000_CAM70%MT_SLND_SICE_DOCN%AQP3_SROF_SGLC_SWAV |
614 | | - |
615 | | -cime_config/testdefs/testlist_cam.xml |
616 | | -. increase time limit to 20 minutes for these prealpha tests: |
617 | | - ERP_Ln9.f09_f09_mg17.FHIST_BGC.derecho_intel.cam-outfrq9s |
618 | | - ERP_Ln9.f09_f09_mg17.FHIST.derecho_intel.cam-outfrq9s |
619 | | -. remove non-working DAE test |
620 | | -. replace ERP_D_Ln9.f19_f19_mg17.QPC6.derecho_intel.cam-outfrq9s |
621 | | - by ERP_D_Ln9.ne30pg3_ne30pg3_mg17.QPLT.derecho_intel.cam-outfrq3s_cosp |
622 | | -. Add ERP_D_Ln9.ne30pg3_ne30pg3_mg17.QPMT.derecho_intel.cam-outfrq3s |
623 | | -. replace ERP_D_Ln9.ne3pg3_ne3pg3_mg37.QPC6.izumi_gnu.cam-outfrq9s_rrtmgp |
624 | | - by ERP_D_Ln9.ne3pg3_ne3pg3_mg37.QPLT.izumi_gnu.cam-outfrq9s |
625 | | -. Add ERP_D_Ln9.ne3pg3_ne3pg3_mg37.QPMT.izumi_gnu.cam-outfrq9s |
626 | | - |
627 | | -cime_config/testdefs/testmods_dirs/cam/outfrq3s_cosp/shell_commands |
628 | | -. remove "./xmlchange CAM_NML_USE_CASE=UNSET" |
629 | | - |
630 | | -cime_config/testdefs/testmods_dirs/cam/outfrq3s_cosp/user_nl_cam |
631 | | -. add CS_SNOWCERT and CS_SNOWPOSS to fexcl1 |
632 | | - |
633 | | -src/chemistry/mozart/mo_drydep.F90 |
634 | | -. get_landuse_and_soilw_from_file |
635 | | - - restrict the INFO messages to only print from masterproc |
636 | | - |
637 | | -src/physics/cam/cam_diagnostics.F90 |
638 | | -. diag_init_dry |
639 | | - - add addfld call for UT, and corresponding add_default for UT inside the |
640 | | - history_eddy conditional. |
641 | | -. diag_phys_writeout_dry |
642 | | - - add calculation and outfld call for UT |
643 | | -. diag_init_moist |
644 | | - - add addfld call for UQ, and corresponding add_default for UQ inside the |
645 | | - history_eddy conditional. |
646 | | -. diag_phys_writeout_moist |
647 | | - - add calculation and outfld call for UQ |
648 | | - |
649 | | -src/physics/cam/microp_aero.F90 |
650 | | -. microp_aero_run |
651 | | - - add condition that number of bulk aerosols must be > 0 before calling |
652 | | - ndrop_bam_run. |
653 | | - |
654 | | -src/physics/cam/nucleate_ice_cam.F90 |
655 | | -. nucleate_ice_cam_calc |
656 | | - - add conditionals so naer2 array not referenced when there are no |
657 | | - aerosols. |
658 | | - |
659 | | -src/physics/cam/vertical_diffusion.F90 |
660 | | -. vertical_diffusion_init |
661 | | - - fix conditional around add_default call for UFLX and VFLX so those |
662 | | - fields aren't added if they're not computed. |
663 | | - |
664 | | -src/physics/cam7/physpkg.F90 |
665 | | -. tphysbc |
666 | | - - add conditionals so modal aerosol calculations only called when modal |
667 | | - aerosols are present. |
668 | | - |
669 | | -If there were any failures reported from running test_driver.sh on any test |
670 | | -platform, and checkin with these failures has been OK'd by the gatekeeper, |
671 | | -then copy the lines from the td.*.status files for the failed tests to the |
672 | | -appropriate machine below. All failed tests must be justified. |
673 | | - |
674 | | -derecho/intel/aux_cam: |
675 | | - |
676 | | -derecho/nvhpc/aux_cam: |
677 | | - |
678 | | -izumi/nag/aux_cam: |
679 | | - |
680 | | -izumi/gnu/aux_cam: |
681 | | - |
682 | | -CAM tag used for the baseline comparison tests if different than previous |
683 | | -tag: |
684 | | - |
685 | | -Summarize any changes to answers: |
686 | | - |
687 | | -=============================================================== |
688 | | -=============================================================== |
689 | | - |
690 | 690 | Tag name: cam6_4_047 |
691 | 691 | Originator(s): jedwards4b, fvitt |
692 | 692 | Date: 19 November 2024 |
|
0 commit comments