Skip to content

UFS-dev PR#254 #1142

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

Merged
grantfirl merged 46 commits into from
Jun 20, 2025
Merged

UFS-dev PR#254 #1142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
1fc0f54
Optional argument cleanup: Radiation
dustinswales Nov 18, 2024
e2eea95
Optional argument cleanup: Convection
dustinswales Nov 18, 2024
76eaf4a
Optional argument cleanup: GWD
dustinswales Nov 19, 2024
bff271c
Optional argument cleanup: MP
dustinswales Nov 19, 2024
6e0e2f7
Optional argument cleanup: PBL
dustinswales Nov 19, 2024
4572f46
Optional argument cleanup: Surface Layer
dustinswales Nov 19, 2024
8f1c7af
Optional argument cleanup: Surface Models
dustinswales Dec 13, 2024
53d02a9
Optional argument cleanup: CICE and Smoke
dustinswales Dec 13, 2024
c6ad766
Optional argument cleanup: Some interstitials
dustinswales Dec 13, 2024
a6cbcd9
Revert removal of optional arguments in Interstitial schemes.
dustinswales Dec 17, 2024
382cdb0
Merge branch 'ufs/dev' of https://github.com/ufs-community/ccpp-physi…
dustinswales Dec 17, 2024
bdeab29
REvert one more change
dustinswales Dec 18, 2024
339f4b8
Merge branch 'ufs/dev' of https://github.com/ufs-community/ccpp-physi…
dustinswales Jan 3, 2025
03610ea
Merge branch 'ufs/dev' of https://github.com/ufs-community/ccpp-physi…
dustinswales Jan 14, 2025
9576598
Bug
dustinswales Jan 27, 2025
0b21754
Merge branch 'ufs/dev' of https://github.com/ufs-community/ccpp-physi…
dustinswales Jan 27, 2025
6a46eed
Anothe bug
dustinswales Jan 27, 2025
8706c32
One last bug from testing
dustinswales Jan 28, 2025
2e6aff1
SOme more changes from RTs
dustinswales Feb 12, 2025
ef9f759
Merge branch 'ufs/dev' of https://github.com/ufs-community/ccpp-physi…
dustinswales Feb 12, 2025
423464e
Revert some changes
dustinswales Feb 19, 2025
12a3bf4
Merge branch 'ufs/dev' of https://github.com/ufs-community/ccpp-physi…
dustinswales Feb 19, 2025
eed5551
Revert merge conflict
dustinswales Feb 19, 2025
4c34279
NSSL-MP scheme update:
MicroTed Feb 21, 2025
3776141
Typo fix
MicroTed Feb 21, 2025
b3f86f8
Merge branch 'ufs/dev' of https://github.com/ufs-community/ccpp-physi…
dustinswales Feb 27, 2025
193c11c
Merge branch 'ufs/dev' into nssl3m-update2025a
grantfirl Mar 21, 2025
fee8bf0
Bug fix for subroutine set_aerosol_tracer_index to set kk correctly …
MicroTed Mar 24, 2025
0f9e77f
Merge branch 'nssl3m-update2025a' of https://github.com/MicroTed/ccpp…
MicroTed Mar 24, 2025
ba0d507
Merge branch 'ufs/dev' into nssl3m-update2025a
grantfirl Mar 28, 2025
13c362b
module_mp_nssl_2mom.F90 : G. Firl code change suggestion and interfa…
MicroTed Apr 2, 2025
aef71ed
bring doc changes only over from scidoc4SRW3 branch
grantfirl Apr 4, 2025
86b2a06
remove files removed from scidoc4SRW3 branch
grantfirl Apr 4, 2025
b7ce3d2
remove one more file that was missed
grantfirl Apr 4, 2025
2d8b1f2
Merge pull request #263 from grantfirl/scidoc4SRW3_gjf
grantfirl Apr 4, 2025
c7479db
Merge pull request #259 from climbfuji/feature/cmake_updates_from_nep…
grantfirl Apr 16, 2025
4843887
Merge branch 'ufs/dev' of https://github.com/ufs-community/ccpp-physi…
dustinswales Apr 16, 2025
5bc3485
module_mp_nssl_2mom.F90 :
MicroTed Apr 17, 2025
de2f058
Merge pull request #248 from dustinswales/feature/optional_args_again
dustinswales Apr 25, 2025
625f1ee
Merge branch 'ufs/dev' into nssl3m-update2025a
grantfirl Apr 28, 2025
f0c7a9c
Merge branch 'release/srw-v3' into srwv3-to-ufsdev
grantfirl Apr 28, 2025
37405ee
Merge branch 'srwv3-to-ufsdev' into nssl3m-update2025a
grantfirl Apr 28, 2025
f22ac1c
Merge branch 'nssl3m-update2025a' into ufs-dev-PR254
hertneky May 27, 2025
53d32fa
fix issue with namelist for NSSL MP
grantfirl Jun 13, 2025
e27736c
update NSSL MP to use internal namelist like other physics in UFS
grantfirl Jun 17, 2025
04cb62d
add iostat to internal namelist read to capture read error for NSSL M…
grantfirl Jun 17, 2025
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
4 changes: 1 addition & 3 deletions physics/GWD/ugwp_driver_v0.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ module ugwp_driver_v0
!ugwp-v0 subroutines: GWDPS_V0 and fv3_ugwp_solv2_v0
!
!=====================================================================
!>\ingroup cires_ugwp_run_mod
!>\defgroup ugwp_driverv0_mod UGWP V0 Driver Module
!! This is the CIRES UGWP V0 driver module
!!
Expand Down Expand Up @@ -924,8 +923,7 @@ end subroutine gwdps_v0
!===============================================================================
!23456==============================================================================

!>\ingroup cires_ugwp_run_mod
!! A modification of the Scinocca (2003) \cite scinocca_2003 algorithm for
!> A modification of the Scinocca (2003) \cite scinocca_2003 algorithm for
!! NGWs with non-hydrostatic and rotational
!!effects for GW propagations and background dissipation
subroutine fv3_ugwp_solv2_v0(klon, klev, dtime,
Expand Down
6 changes: 4 additions & 2 deletions physics/Interstitials/UFS_SCM_NEPTUNE/GFS_PBL_generic_common.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ subroutine set_aerosol_tracer_index(imp_physics, imp_physics_wsm6, &
imp_physics_thompson, ltaerosol,mraerosol, &
imp_physics_mg, ntgl, imp_physics_gfdl, &
imp_physics_zhao_carr, imp_physics_nssl,&
nssl_hail_on, nssl_ccn_on, kk, &
nssl_hail_on, nssl_ccn_on, nssl_3moment, kk, &
errmsg, errflg)
implicit none
!
integer, intent(in ) :: imp_physics, imp_physics_wsm6, &
imp_physics_thompson, &
imp_physics_mg, ntgl, imp_physics_gfdl, &
imp_physics_zhao_carr,imp_physics_nssl
logical, intent(in ) :: ltaerosol, mraerosol, nssl_hail_on, nssl_ccn_on
logical, intent(in ) :: ltaerosol, mraerosol, nssl_hail_on, nssl_ccn_on, nssl_3moment
integer, intent(out) :: kk
character(len=*), intent(out) :: errmsg
integer, intent(out) :: errflg
Expand Down Expand Up @@ -59,8 +59,10 @@ subroutine set_aerosol_tracer_index(imp_physics, imp_physics_wsm6, &
elseif (imp_physics == imp_physics_nssl) then
IF ( nssl_hail_on ) THEN
kk = 16
IF ( nssl_3moment ) kk = kk + 3
ELSE
kk = 13
IF ( nssl_3moment ) kk = kk + 2
ENDIF
IF ( nssl_ccn_on ) kk = kk + 1
else
Expand Down
2 changes: 1 addition & 1 deletion physics/Interstitials/UFS_SCM_NEPTUNE/GFS_PBL_generic_post.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ subroutine GFS_PBL_generic_post_run (im, levs, nvdiff, ntrac,
imp_physics_thompson, ltaerosol,mraerosol, &
imp_physics_mg, ntgl, imp_physics_gfdl, &
imp_physics_zhao_carr, imp_physics_nssl,&
nssl_hail_on, nssl_ccn_on, kk, &
nssl_hail_on, nssl_ccn_on, nssl_3moment, kk, &
errmsg, errflg)
if (errflg /= 0) return
!
Expand Down
2 changes: 1 addition & 1 deletion physics/Interstitials/UFS_SCM_NEPTUNE/GFS_PBL_generic_pre.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ subroutine GFS_PBL_generic_pre_run (im, levs, nvdiff, ntrac, rtg_ozone_index,
imp_physics_thompson, ltaerosol,mraerosol, &
imp_physics_mg, ntgl, imp_physics_gfdl, &
imp_physics_zhao_carr, imp_physics_nssl,&
nssl_hail_on, nssl_ccn_on, kk, &
nssl_hail_on, nssl_ccn_on, nssl_3moment, kk, &
errmsg, errflg)
if (errflg /= 0) return
!
Expand Down
19 changes: 7 additions & 12 deletions physics/Interstitials/UFS_SCM_NEPTUNE/GFS_photochemistry.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,25 @@
! #########################################################################################
!> \file GFS_photochemistry.f90
!> \file GFS_photochemistry.F90
!!
! #########################################################################################

module GFS_photochemistry
use machine, only: kind_phys
use module_ozphys, only: ty_ozphys
use module_h2ophys, only: ty_h2ophys
implicit none
contains

! #########################################################################################
!> \section arg_table_GFS_photochemistry_init Argument Table
!! \htmlinclude GFS_photochemistry_init.html
!!
! #########################################################################################
subroutine GFS_photochemistry_init(oz_phys_2006, oz_phys_2015, h2o_phys, errmsg, errflg)
logical, intent(in) :: &
oz_phys_2015, & ! Do ozone photochemistry? (2015)
oz_phys_2006, & ! Do ozone photochemistry? (2006)
h2o_phys ! Do stratospheric h2o photochemistry?
oz_phys_2015, & !< Do ozone photochemistry? (2015)
oz_phys_2006, & !< Do ozone photochemistry? (2006)
h2o_phys !< Do stratospheric h2o photochemistry?
character(len=*), intent(out) :: &
errmsg ! CCPP Error message.
errmsg !< CCPP Error message.
integer, intent(out) :: &
errflg ! CCPP Error flag.
errflg !< CCPP Error flag.

! Initialize CCPP error handling variables
errmsg = ''
Expand All @@ -44,11 +41,9 @@ subroutine GFS_photochemistry_init(oz_phys_2006, oz_phys_2015, h2o_phys, errmsg,

end subroutine GFS_photochemistry_init

! #########################################################################################
!> \section arg_table_GFS_photochemistry_run Argument Table
!! \htmlinclude GFS_photochemistry_run.html
!!
! #########################################################################################
subroutine GFS_photochemistry_run (dtp, ozphys, oz_phys_2015, oz_phys_2006, con_1ovg, &
prsl, dp, ozpl, h2o_phys, h2ophys, h2opl, h2o0, oz0, gt0, do3_dt_prd, do3_dt_ozmx, &
do3_dt_temp, do3_dt_ohoz, errmsg, errflg)
Expand Down
24 changes: 12 additions & 12 deletions physics/Interstitials/UFS_SCM_NEPTUNE/sgscloud_radpre.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,18 @@ module sgscloud_radpre
!> \section arg_table_sgscloud_radpre_run Argument Table
!! \htmlinclude sgscloud_radpre_run.html
!!
!! cloud array description: !
!! clouds(:,:,1) - layer total cloud fraction !
!! clouds(:,:,2) - layer cloud liq water path !
!! clouds(:,:,3) - mean effective radius for liquid cloud !
!! clouds(:,:,4) - layer cloud ice water path !
!! clouds(:,:,5) - mean effective radius for ice cloud !
!! clouds(:,:,6) - layer rain drop water path !
!! clouds(:,:,7) - mean effective radius for rain drop !
!! clouds(:,:,8) - layer snow flake water path !
!! clouds(:,:,9) - mean effective radius for snow flake
!!
!>\section sgscloud_radpre_mod SGS Cloud Scheme Pre General Algorithm
! cloud array description: !
! clouds(:,:,1) - layer total cloud fraction !
! clouds(:,:,2) - layer cloud liq water path !
! clouds(:,:,3) - mean effective radius for liquid cloud !
! clouds(:,:,4) - layer cloud ice water path !
! clouds(:,:,5) - mean effective radius for ice cloud !
! clouds(:,:,6) - layer rain drop water path !
! clouds(:,:,7) - mean effective radius for rain drop !
! clouds(:,:,8) - layer snow flake water path !
! clouds(:,:,9) - mean effective radius for snow flake
!
! \section sgscloud_radpre_mod SGS Cloud Scheme Pre General Algorithm
subroutine sgscloud_radpre_run( &
im,dt,fhswr,levs, &
flag_init,flag_restart, &
Expand Down
Loading