Gwd latr merge - #4
Closed
matusmartini wants to merge 193 commits into
Closed
Conversation
Changes that allows CCPP physics to be compiled and run in the NRL NEPTUNE model. These changes are relative to CCPP repository hash 24cc09e (Thu May 27 13:02:47 2021 -0600). Note that some of the changes here are NRL-specific and may not relate to the changes for 32-bit floating point. Rather than take these out, I erred on the side of caution and left them in to avoid introducing errors. A few highlights: - Autopromotion using -r8 is turned off except for mersenne_twister when SINGLE_PREC is defined - A number of source files that contained bare subroutines and functions are turned to modules and use-associated where needed. This is valuable for checking dummy/actual argument lists for precision type-agreement - Conditional guard-rails added where needed to prevent div-zero and neg args to log, sqrt, etc. Status is that this compiles and runs in NEPTUNE for 150 steps (75 minutes) without floating point exceptions or NaNs using CCPP physics suite four. More careful meteorological V&V is a TODO. On Narwhal, an AMD Epyc Rome system at NAVO, these changes halved the time spent in physics. J. Michalakes, 20211107 Changes to be committed: modified: CMakeLists.txt modified: physics/GFS_MP_generic.F90 modified: physics/GFS_rad_time_vary.fv3.F90 modified: physics/GFS_rad_time_vary.fv3.meta modified: physics/GFS_rrtmg_post.meta modified: physics/GFS_rrtmg_pre.F90 modified: physics/GFS_rrtmg_pre.meta modified: physics/GFS_rrtmg_setup.F90 modified: physics/GFS_rrtmg_setup.meta modified: physics/calpreciptype.f90 modified: physics/cires_orowam2017.f modified: physics/cires_ugwp.F90 modified: physics/cires_ugwp_triggers.F90 modified: physics/cires_ugwpv1_sporo.F90 modified: physics/funcphys.f90 modified: physics/gcycle.F90 modified: physics/h2ophys.f modified: physics/iounitdef.f modified: physics/machine.F modified: physics/mfpbl.f modified: physics/mfpblt.f modified: physics/mfpbltq.f modified: physics/mfscu.f modified: physics/mfscuq.f modified: physics/module_SGSCloud_RadPre.F90 modified: physics/module_bl_mynn.F90 modified: physics/module_mp_thompson.F90 modified: physics/moninedmf.f modified: physics/physcons.F90 modified: physics/radiation_astronomy.f modified: physics/radlw_main.F90 modified: physics/radsw_main.F90 modified: physics/samfdeepcnv.f modified: physics/sascnvn.F modified: physics/sfc_diag_post.F90 modified: physics/sfc_drv.f modified: physics/sfc_drv_ruc.meta modified: physics/sflx.f modified: physics/surface_perturbation.F90 modified: physics/tridi.f modified: physics/ugwp_driver_v0.F
Fix for used-before-set warning generated by Cray compiler. TODO: what should smc be besides zero?
Revert previous commit. SMC is being set, in spite of used-before-set warning from compiler. Cray compiler doesn't see the effects of "contained" subroutines.
Cray compiler reports min_rand is used before being defined. Looks like it's correct this time. Only an issue if rand_pertub_on .ne. 0.
Fix for array "he" being used before defined. Change its intent from OUT to INOUT
Fix for Cray Fortran unit numbers. Change NICO2CN from 102 to 113 (must not be between 100 and 102 inclusive)
renamed: gscond.f -> gscond.F renamed: module_sf_noahmp_glacier.f90 -> module_sf_noahmp_glacier.F90 renamed: module_sf_noahmplsm.f90 -> module_sf_noahmplsm.F90 renamed: sfc_diag.f -> sfc_diag.F renamed: sfc_diff.f -> sfc_diff.F renamed: sfc_nst.f -> sfc_nst.F renamed: sfc_sice.f -> sfc_sice.F
commit be520af02f185d7bde04b1e1a50193c0c9e7989d
Author: John Michalakes <john.michalakes.ctr@nrlmry.navy.mil>
Date: Tue May 3 14:27:26 2022 -0700
On branch pr-stops-in-ccpp
Replace bare stop statements with calls to ccpp_external_abort
routine defined in machine.F
On branch local_updates
Changes to be committed:
modified: GFS_debug.F90
modified: GFS_rrtmg_setup.F90
modified: cires_ugwpv1_oro.F90
modified: cldmacro.F
modified: cu_gf_deep.F90
modified: gcycle.F90
modified: m_micro.F90
modified: machine.F
modified: module_SF_JSFC.F90
modified: module_gfdl_cloud_microphys.F90
modified: module_mp_thompson.F90
modified: module_sf_exchcoef.f90
modified: module_sf_mynn.F90
modified: module_sf_ruclsm.F90
modified: radiation_aerosols.f
modified: radiation_astronomy.f
modified: radiation_clouds.f
modified: radiation_gases.f
modified: radlw_main.F90
modified: radsw_main.F90
modified: set_soilveg.f
modified: set_soilveg_ruc.F90
modified: sfc_diff.F
modified: sfcsub.F
modified: sflx.f
modified: wv_saturation.F
commit 40211f8247d8a1094959b8165461d15a21936a99
Author: Alex Reinecke <alex.reinecke@nrlmry.navy.mil>
Date: Mon Jul 27 12:36:29 2020 -0700
On branch NEP-374-ccpp-in-refactor
Fixed a bug in the RRTMg code that interpolates aeresol properites from
the 5 degree database to the model grid. In some circumstances the
interpolation would give a different answser for the same physical point
on different processes. This also impact the reproducability of restart.
Changes to be committed:
modified: radiation_aerosols.f
commit f02c88d69d874c196132fce05723698bf4c93fdb
Author: John George Michalakes <michalak@narwhal05.hsn0.narwhal.navydsrc.hpc.mil>
Date: Fri Jun 25 10:44:06 2021 +0000
On branch pr-omp-fix-1.2-updates
Fix for hang/crash in physics on Narwhal when OMP_NUM_THREADS > 1
commit 6a978135b15b9bc9d652ca4932e79cb167398149
Author: John Michalakes <michalakes@sandy1.local>
Date: Thu Apr 15 05:00:09 2021 -0700
On branch pr_narwhale_updates_20210414
Reorganized !$omp single directives into one !$omp single region.
commit 01e13ee644f326f03b3748780dea3bad243d8844
Author: John George Michalakes <michalak@narwhal01.hsn0.narwhal.navydsrc.hpc.mil>
Date: Wed Apr 14 21:29:49 2021 +0000
On branch narwhal_updates
Add a namelist option, ccpp_timevary_bcast, that causes CCPP physics
that reads time-varying files in run methods to read on root task and
bcast to the others to avoid problems with very large numbers of tasks.
The changes are flagged with "kludge 20210414" and there's a detailed
comment block advising of the limitations of this approach near the end
of parallel_submod.F90 where some routines to support the kludginess
has been added. CCPP is being updated to address this issue so the
kludge should only be necessary for a short time. By default the kludge
is disable and should only be enabled for runs on large numbers of
tasks. At this point, only the time varying reads in radiation_aerosols
have been modified. There may be other CCPP packages that need this too.
On branch local_updates
Changes to be committed:
modified: radiation_aerosols.f
commit fcab754529868ed6f41b06c59d6337c713356bdf
Author: Alex Reinecke <alex.reinecke@nrlmry.navy.mil>
Date: Mon Jul 27 12:01:01 2020 -0700
On branch NEP-374-ccpp-in-refactor
GFS physics rayleigh damping is not reproduceable on different core counts. Fix.
commit 905202225e97e76c32cd827c5fae0663db53cd50 (origin/pr-bfb-jedi-v-standalone-fcst)
Author: John Michalakes <john.michalakes.ctr@nrlmry.navy.mil>
Date: Tue Jul 27 11:10:14 2021 -0700
On branch pr-bfb-jedi-v-standalone-fcst
Updates to neptune model code and the CCPP physics so that the jedi ci/fcst_match test compares
bit-for-bit comparing the model running under jedi versus the model running standalone. Here
is the output from ci/fcst_match/run_fcst_compare.sh:
$ cat ../../ci/fcst_match/compare.log
compare ci_restart_E0020P4L089_20180315T00_PT000000H00M00S.hdf5: jedi_mpi240_omp01 to neptune_mpi240_omp01
Ndifs RMS (1) RMS (2) DIGITS RMSE PnTWISE MAX
compare ci_restart_E0020P4L089_20180315T00_PT000000H04M00S.hdf5: jedi_mpi240_omp01 to neptune_mpi240_omp01
Ndifs RMS (1) RMS (2) DIGITS RMSE PnTWISE MAX
One of the changed involved moving -lm until after the mkl libs in the cfg/config.compiler.intel and
cfg/config.general_settings.
The other change involves adding a local version of the gamma function to the Grell-Frietas cumulus
in CCPP. The code for the local version is from:
https://rosettacode.org/wiki/my_gamma_function#Fortran
Using a local version prevents the jedi neptune and the standalone neptune from linking to different versions
of the gamma function. THIS IS A LOCAL HACK TO CCPP PHYSICS.
Changes to be committed:
modified: cfg/config.compiler.intel
modified: cfg/config.general_settings
modified: external/ccpp/physics/physics/cu_gf_deep.F90
commit 73fa531ee5cf0b1809b172e1d203446bcc9d08ce
Author: Alex Reinecke <alex.reinecke@nrlmry.navy.mil>
Date: Sat Aug 14 16:20:37 2021 -0700
Add CPP ifdeffor fortran intrinsic gamma function vs extrinsic gamma function (defined in cu_gf_deep.F90).
The intrinsic is at least 25x faster, but the extrinsic garuntees bit-for-bit agreement with JEDI driven code.
On branch gamma_func_option
Changes to be committed:
modified: external/ccpp/physics/physics/cu_gf_deep.F90
On branch local_updates
Changes to be committed:
modified: physics/cu_gf_deep.F90
commit a8ab0852bb0b19b060db7964b4ce1f2f3a4ec647
Author: Matus Martini <matus.martini.ctr@nrlmry.navy.mil>
Date: Thu Mar 3 23:49:18 2022 +0000
On branch NEP-504-new-cloud-fraction-schemes
Add unified GWD driver which is equivalent to running with default
(cires) with do_ugwp=.false. and gwd_opt=2.
Changes to be committed:
modified: external/ccpp/config/ccpp_prebuild_config.py
modified: external/ccpp/physics/physics/unified_ugwp.F90
On branch local_updates
Changes to be committed:
modified: unified_ugwp.F90
commit aa7420fb48c12885a2d0a2c3601c2f0781d03b01
Author: Alex Reinecke <alex.reinecke@nrlmry.navy.mil>
Date: Thu Mar 3 19:28:09 2022 +0000
Change ric from 1 to 0.
external/ccpp/physics/physics/satmedmfvdifq.F edited online with Bitbucket
commit fd95cb1fb626efcc39c22e2395d1998e1792232b
Author: Alex Reinecke <alex.reinecke@nrlmry.navy.mil>
Date: Tue Feb 8 17:37:30 2022 +0000
Add parameter ric to moist edmf to control stable/ustable regiem when
computing eddy diffusivities.
This was hard coded to be 0. Set to 1.0.
On branch NEP-500-dynamics-sgs
Changes to be committed:
modified: external/ccpp/physics/physics/satmedmfvdifq.F
commit cd427a64c13d34aacca739e55573c3cd7c9a36dc
Author: Alex Reinecke <alex.reinecke@nrlmry.navy.mil>
Date: Tue Feb 8 17:32:25 2022 +0000
Bug fix for mixing length calculation in moist EDMF scheme.
On branch NEP-500-dynamics-sgs
Changes to be committed:
modified: external/ccpp/physics/physics/satmedmfvdifq.F
commit 9bf135ba15501df5972637ba580d2c6cc9be1065 (origin/NEP-479-ccpp5-suites)
Author: Matus Martini <martini.matus@gmail.com>
Date: Wed Jan 5 16:32:49 2022 -0800
Pull recent updates of TKE EDMF from ccpp-physics repo. This fixes handling
of negative TKE, moisture, and tracers.
On branch NEP-479-ccpp5-suites
Changes to be committed:
modified: external/ccpp/physics/physics/satmedmfvdifq.F
commit ce7b8f6b86a0a193510d652c9076bc307c06f1e6
Author: Alex Reinecke <alex.reinecke@nrlmry.navy.mil>
Date: Tue Dec 21 10:42:36 2021 -0800
Add mixing length as output for satmedmfvdifq.
On branch phys_vars_advect
Changes to be committed:
modified: external/ccpp/data/GFS_diag_module.F90
modified: external/ccpp/data/GFS_restart_module.F90
modified: external/ccpp/data/GFS_typedefs_module.F90
modified: external/ccpp/data/GFS_typedefs_module.meta
modified: external/ccpp/physics/physics/satmedmfvdifq.F
modified: external/ccpp/physics/physics/satmedmfvdifq.meta
commit 1de3b72f17d069d81e21b6a276dbe26eddba64bc
Author: Matus Martini <martini.matus@gmail.com>
Date: Mon Dec 13 19:34:08 2021 -0800
Fix calculation of zorl over sea ice. No longer huge
negative surface roughness for GFSv16.
On branch feature/NEP-487-gfsv16-input
Changes to be committed:
modified: external/ccpp/physics/physics/GFS_surface_composites.F90
commit f97db206606cdda3f4201bff5b8b2f7dd956f92f
Author: Matus Martini <matus.martini.ctr@nrlmry.navy.mil>
Date: Thu Nov 18 18:18:02 2021 +0000
Add use statements for the new modules that were originally subroutines
in CCPP before John M. converted them to modules. Now it compiles
without errors.
On branch NEP-479-ccpp5-suites
Changes to be committed:
modified: external/ccpp/physics/physics/satmedmfvdifq.F
commit 95de4b55d5b2ffa79d88be668d03352e86014f05
Author: Matus Martini <martini.matus@gmail.com>
Date: Wed Nov 17 20:57:39 2021 -0800
Update SATMEDMF scheme
On branch NEP-479-ccpp5-suites
Changes to be committed:
modified: external/ccpp/data/GFS_typedefs_module.F90
modified: external/ccpp/data/GFS_typedefs_module.meta
modified: external/ccpp/physics/physics/GFS_surface_composites.F90
modified: external/ccpp/physics/physics/GFS_surface_composites.meta
modified: external/ccpp/physics/physics/satmedmfvdifq.F
modified: external/ccpp/physics/physics/satmedmfvdifq.meta
modified: external/ccpp/physics/physics/sfc_diff.F
modified: external/ccpp/physics/physics/sfc_diff.meta
On branch local_updates
Changes to be committed:
modified: GFS_surface_composites.F90
modified: GFS_surface_composites.meta
modified: satmedmfvdifq.F
modified: satmedmfvdifq.meta
modified: sfc_diff.F
modified: sfc_diff.meta
commit a37cca5663446ee5970ef4b348aa818cba025514
Author: Matus Martini <martini.matus@gmail.com>
Date: Thu Jun 3 19:57:00 2021 -0700
Comment out module use as they are not used. Reported to ccpp-physics.
On branch NEP-451-ccpp5
Changes to be committed:
modified: external/ccpp/physics/physics/radiation_surface.f
On branch local_updates
Changes to be committed:
modified: radiation_surface.f
commit 5a3b8e37c15ca44587a1857b49a30ffcfacf6f32
Author: John George Michalakes <michalak@narwhal01.navydsrc.HPC.MIL>
Date: Fri Nov 12 11:40:14 2021 +0000
TODO COMMENT FOR POTENTIAL BUG -- jj can be undefined
On branch NEP-474-single-precision-neptune-with-ccpp-physics
Changes to be committed:
modified: external/ccpp/physics/physics/sfcsub.F
On branch local_updates
Changes to be committed:
modified: sfcsub.F
commit f3fbd8d15b6393ebda050021b59a403981f82d7c
Author: John Michalakes <michalak@ucar.edu>
Date: Thu Dec 9 16:01:50 2021 +0000
Remove unneeded variable, ii
Changes to be committed:
external/ccpp/physics/physics/GFS_rad_time_vary.fv3.F90
commit 9f17f114c6e4cb5bf6a3747b6c46beb9bcfdb8b4
Author: John Michalakes <john.michalakes.ctr@nrlmry.navy.mil>
Date: Tue Dec 7 15:55:24 2021 -0800
Fix copying of random number seeds when there are more than
one physics block (happens with threading). Comment has more info
On branch NEP-486-rrtmgp-omp2
Changes to be committed:
modified: external/ccpp/physics/physics/GFS_rad_time_vary.fv3.F90
commit 9981964c973f5c3508340d8185ebe96d23aa4634
Author: John Michalakes <john.michalakes.ctr@nrlmry.navy.mil>
Date: Tue Nov 30 13:17:11 2021 -0800
Restored rrtmgp from submodule and updated CI tests
Adding an omp single region around branch that sets random number seeds from NEPTUNE
in GFS_rad_time_vary.fv3.F90
On branch NEP-486-rrtmgp-omp2
Changes to be committed:
modified: ci/omp_test/run_ci.sh
modified: ci/physics/test_threads_suite4/neptune.nml
modified: ci/physics/test_threads_suite4/run_ci.sh
modified: external/ccpp/physics/physics/GFS_rad_time_vary.fv3.F90
commit a363f4ddd47dee04cd8672214a1c5e77e51e93dc
Author: John Michalakes <john.michalakes.ctr@nrlmry.navy.mil>
Date: Mon Nov 29 15:17:00 2021 -0800
Repair omp parallel directive by adding rseeds to list of shared
On branch bugfix/NEP-486-rrtmgp-omp2
Changes to be committed:
modified: external/ccpp/physics/physics/GFS_rad_time_vary.fv3.F90
commit 38990e9f917a455ac44b3d5e65fefbc7135706dc
Author: Matus Martini <martini.matus@gmail.com>
Date: Thu Jun 17 21:55:17 2021 -0700
Implement random seeds generated on NEPTUNE grid for CCPP radiation
On branch NEP-451-ccpp5
Changes to be committed:
modified: external/ccpp/data/GFS_typedefs.F90
modified: external/ccpp/data/GFS_typedefs.meta
modified: external/ccpp/physics/physics/GFS_rad_time_vary.fv3.F90
modified: external/ccpp/physics/physics/GFS_rad_time_vary.fv3.meta
On branch local_updates
Changes to be committed:
modified: GFS_rad_time_vary.fv3.F90
commit fd9f2356f64787c46a90eeb4f982d6f74e9abc9e
Author: Matus Martini <martini.matus@gmail.com>
Date: Fri Feb 19 22:50:32 2021 -0800
Add lextop and ltp into control type so extra top layer for radiation
can be invoked from namelist. Change metadata tables appropriately.
On branch NEP-428-model-top-radiation
Changes to be committed:
modified: external/ccpp/data/GFS_typedefs.F90
modified: external/ccpp/data/GFS_typedefs.meta
modified: external/ccpp/physics/physics/GFS_rrtmg_post.meta
modified: external/ccpp/physics/physics/GFS_rrtmg_pre.F90
modified: external/ccpp/physics/physics/GFS_rrtmg_setup.F90
modified: external/ccpp/physics/physics/GFS_rrtmg_setup.meta
modified: external/ccpp/physics/physics/radcons.f90
modified: external/ccpp/physics/physics/rrtmg_lw_post.meta
modified: external/ccpp/physics/physics/rrtmg_sw_post.meta
On branch local_updates
Changes to be committed:
modified: radcons.f90
modified: rrtmg_lw_post.meta
modified: rrtmg_sw_post.meta
commit 0171d964b54b22ae3382696114833b6d61ce9c8a (origin/bugfix/NEP-502-spurious-ozone)
Author: Alex Reinecke <alex.reinecke@nrlmry.navy.mil>
Date: Thu Jan 27 17:08:31 2022 +0000
Remove copy of ozone to convectively transported tracer array in interstitial 3.
This is symetric to the previous change in interstitial 4. The change is needed
so that the tracer index is consistent between insterstitial 3 and 4.
On branch bugfix/NEP-502-spurious-ozone
Changes to be committed:
modified: external/ccpp/physics/physics/GFS_suite_interstitial.F90
modified: external/ccpp/physics/physics/GFS_suite_interstitial.meta
commit 084b3e2d865c24cdc16926b2cc3080e66862546f
Author: Alex Reinecke <alex.reinecke@nrlmry.navy.mil>
Date: Mon Jan 24 18:08:22 2022 +0000
Add explanation in comments.
On branch bugfix/NEP-502-spurious-ozone
Changes to be committed:
external/ccpp/physics/physics/GFS_suite_interstitial.F90
commit f40fc20fac17846756d0ac2b6172e32cf5e4e489
Author: Alex Reinecke <alex.reinecke@nrlmry.navy.mil>
Date: Sun Jan 23 01:34:10 2022 +0000
Remove convective transport of ozone from interstitial4.
On branch bugfix/NEP-502-spurious-ozone
Changes to be committed:
modified: external/ccpp/physics/physics/GFS_suite_interstitial.F90
modified: external/ccpp/physics/physics/GFS_suite_interstitial.meta
On branch local_updates
Changes to be committed:
modified: GFS_suite_interstitial.F90
modified: GFS_suite_interstitial.meta
commit 0b50f73ac840ba33566ba1930310daa2a87aa30d
Author: John George Michalakes <michalak@narwhal07.navydsrc.hpc.mil>
Date: Mon Nov 15 22:19:25 2021 +0000
Use specific kind= declaration
On branch release/1.3
Changes to be committed:
modified: external/ccpp/physics/physics/maximum_hourly_diagnostics.F90
On branch local_updates
Changes to be committed:
modified: maximum_hourly_diagnostics.F90
commit 01e13ee644f326f03b3748780dea3bad243d8844
Author: John George Michalakes <michalak@narwhal01.hsn0.narwhal.navydsrc.hpc.mil>
Date: Wed Apr 14 21:29:49 2021 +0000
Add a namelist option, ccpp_timevary_bcast, that causes CCPP physics
that reads time-varying files in run methods to read on root task and
bcast to the others to avoid problems with very large numbers of tasks.
The changes are flagged with "kludge 20210414" and there's a detailed
comment block advising of the limitations of this approach near the end
of parallel_submod.F90 where some routines to support the kludginess
has been added. CCPP is being updated to address this issue so the
kludge should only be necessary for a short time. By default the kludge
is disable and should only be enabled for runs on large numbers of
tasks. At this point, only the time varying reads in radiation_aerosols
have been modified. There may be other CCPP packages that need this too.
On branch narwhal_updates
Changes to be committed:
modified: ci/physics/narwhal_benchmark/neptune.nml
modified: external/ccpp/physics/physics/radiation_aerosols.f
modified: mod_neptune_model.F90
modified: neptune.nml.master
modified: parallel_submod.F90
modified: sourceme.narwhal.bash
On branch local_updates
Changes to be committed:
modified: radiation_aerosols.f
commit a2abd81fca5bd6952765028488734c2e526c1464
Author: John George Michalakes <michalak@narwhal01.navydsrc.HPC.MIL>
Date: Fri Nov 12 11:44:14 2021 +0000
No action needed. Inserted comment indicating use-before-define
errors reported by Cray compiler have been checked out and deemed okay
On branch NEP-474-single-precision-neptune-with-ccpp-physics
Changes to be committed:
modified: external/ccpp/physics/physics/radiation_aerosols.f
modified: external/ccpp/physics/physics/sflx.f
On branch local_updates
Changes to be committed:
modified: sflx.f
Local updates
This reverts commit 1e7d927.
Changes to revert bug fixes for mixing length case 2.
errflg as in the authoritative codebase in the following files:
modified: physics/GWD/cires_ugwpv1_oro.F90
modified: physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmg_setup.F90
modified: physics/Interstitials/UFS_SCM_NEPTUNE/gcycle.F90
modified: physics/MP/GFDL/module_gfdl_cloud_microphys.F90
modified: physics/MP/Morrison_Gettelman/m_micro.F90
modified: physics/Radiation/RRTMG/radlw_main.F90
modified: physics/Radiation/radiation_aerosols.f
modified: physics/Radiation/radiation_astronomy.f
modified: physics/Radiation/radiation_clouds.f
modified: physics/Radiation/radiation_gases.f
modified: physics/SFC_Layer/GFDL/module_sf_exchcoef.f90
modified: physics/SFC_Layer/MYJ/module_SF_JSFC.F90
modified: physics/SFC_Layer/MYNN/module_sf_mynn.F90
modified: physics/SFC_Layer/UFS/sfc_diff.f
modified: physics/SFC_Models/Land/Noah/set_soilveg.f
modified: physics/SFC_Models/Land/Noah/sflx.f
modified: physics/SFC_Models/Land/RUC/module_sf_ruclsm.F90
modified: physics/SFC_Models/Land/RUC/set_soilveg_ruc.F90
…iation_astronomy.f and physics/Radiation/radiation_gases.f
…_abort_from_upstream Replace ccpp_external_abort with correct CCPP method where defined upstream
…cidentally deleted MPI broadcast routines
…_ncar_main_20251215 Update branch `neptune` from NCAR `main` as of 2025/12/15
…hen an error occurs during read
…, return with a meaningful error message and flag
…nd_lnd_iau_close_file Bug fixes after CCPP physics update from NCAR main: check file open in UGWP, close file in LAND IAU
…emplates, re-enable GitHub actions testing (NCAR#52) - Update to spack-stack-2.0.0. - Remove upstream pull request and issue templates so that the NEPTUNE org templates are used (this will be a maintained diff between the upstream code and our branch). - Re-enable GitHub actions testing on Atlantis (also a maintained diff).
…th --> dependencies_path
…-physics into feature/update_neptune_from_upstream_20260106
…pstream_20260106 Update neptune from NCAR main 2026/01/06 (metadata-changes only)
…*.F90 when writing to errmsg for invalid w3kindreal/w3kindint; additionally: formatting updates
…thub/workflows/atlantis_basic_checks.yml instead
…-physics into feature/bugfix_time_vary_pre_errmsg_w3kind
…th mpiroot; move mpiutil.F90 to subdirectory tools
…errmsg_w3kind Move Atlantis actions to separate file, fix error messages for w3emc kind mismatches, formatting updates, move mpiutil.F90
…dule_nst_model Prevent division by zero when applying free convection adjustment in NSSTM
Conflicts: physics/GWD/cires_ugwp.F90 physics/GWD/cires_ugwp_module.F90 physics/GWD/unified_ugwp.F90
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This is just a merge of neptune branch into main to see conflicts in GWD schemes