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

Add ability to read increment files on native cubed sphere grid #837

Merged
merged 25 commits into from
Aug 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
50c50f6
Initial commit
DavidNew-NOAA Apr 26, 2024
29bcf40
Change name of namelist parameter
DavidNew-NOAA May 14, 2024
445ee3d
Merge branch 'develop' into feature/cubed_sphere_inc
DavidNew-NOAA May 14, 2024
983a0d7
Merge branch 'develop' into feature/cubed_sphere_inc
DavidNew-NOAA May 17, 2024
5d58dfa
Merge branch 'NOAA-EMC:develop' into feature/cubed_sphere_inc
DavidNew-NOAA May 20, 2024
ba96f35
Merge branch 'develop' into feature/cubed_sphere_inc
DavidNew-NOAA May 30, 2024
80b0988
Update atmos_cubed_sphere hash
DavidNew-NOAA May 30, 2024
3aa1ce2
Merge branch 'feature/cubed_sphere_inc' of https://github.com/DavidNe…
DavidNew-NOAA May 30, 2024
435e209
Update atmos_cubed_sphere hash
DavidNew-NOAA May 30, 2024
e64913c
Merge branch 'develop' into feature/cubed_sphere_inc
DavidNew-NOAA Jun 17, 2024
c78f962
Merge remote-tracking branch 'origin/develop' into feature/cubed_sphe…
DavidNew-NOAA Jul 1, 2024
540c322
Merge branch 'develop' into feature/cubed_sphere_inc
DavidNew-NOAA Jul 15, 2024
67835ec
Update hash
DavidNew-NOAA Jul 15, 2024
1eda2d3
Merge branch 'develop' into feature/cubed_sphere_inc
DavidNew-NOAA Jul 18, 2024
4bb298c
Merge branch 'develop' into feature/cubed_sphere_inc
DavidNew-NOAA Jul 30, 2024
06ef6fc
Update atmos_cubed_sphere hash
DavidNew-NOAA Jul 30, 2024
13e6733
Update atmos_cubed_sphere hash
DavidNew-NOAA Aug 8, 2024
7634b7a
Set .gitmodules
DavidNew-NOAA Aug 8, 2024
3d2147a
Merge branch 'develop' into feature/cubed_sphere_inc
DavidNew-NOAA Aug 9, 2024
2b2aaf9
Update atmos_cubed_sphere hash
DavidNew-NOAA Aug 9, 2024
a3d8fe0
Update hash
DavidNew-NOAA Aug 9, 2024
d7d7e80
Merge branch 'develop' into feature/cubed_sphere_inc
DavidNew-NOAA Aug 13, 2024
40fa2b5
Update hash
DavidNew-NOAA Aug 15, 2024
0167740
Merge remote-tracking branch 'upstream/develop' into feature/cubed_sp…
jkbk2004 Aug 26, 2024
44ca935
hash update and revert change in gitmodules: acs
jkbk2004 Aug 27, 2024
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: 2 additions & 2 deletions atmos_model.F90
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,7 @@ subroutine update_atmos_radiation_physics (Atmos)
if (mpp_pe() == mpp_root_pe()) print *,'PHYSICS STEP2 ', GFS_control%kdt, GFS_control%fhour
call fv3atm_checksum(GFS_control, GFS_Statein, GFS_Stateout, GFS_Grid, GFS_Tbd, GFS_Cldprop, GFS_Sfcprop, GFS_Radtend, GFS_Coupling, Atm_block)
endif
call getiauforcing(GFS_control,IAU_data)
call getiauforcing(GFS_control,IAU_data,Atm(mygrid))
if (mpp_pe() == mpp_root_pe() .and. debug) write(6,*) "end of radiation and physics step"

!--- execute the atmospheric timestep finalize step
Expand Down Expand Up @@ -725,7 +725,7 @@ subroutine atmos_model_init (Atmos, Time_init, Time, Time_step)
Atm(mygrid)%flagstruct%do_skeb = GFS_control%do_skeb

! initialize the IAU module
call iau_initialize (GFS_control,IAU_data,Init_parm)
call iau_initialize (GFS_control,IAU_data,Init_parm,Atm(mygrid))

Init_parm%blksz => null()
Init_parm%ak => null()
Expand Down
8 changes: 8 additions & 0 deletions ccpp/data/GFS_typedefs.F90
Original file line number Diff line number Diff line change
Expand Up @@ -1606,6 +1606,9 @@ module GFS_typedefs
real(kind=kind_phys), pointer :: si(:) !< vertical sigma coordinate for model initialization
real(kind=kind_phys) :: sec !< seconds since model initialization

!--- Increment grid
logical :: increment_file_on_native_grid ! increment on native grid else Gaussian grid

!--- IAU
integer :: iau_offset
real(kind=kind_phys) :: iau_delthrs ! iau time interval (to scale increments) in hours
Expand Down Expand Up @@ -3889,6 +3892,9 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
logical :: ca_entr = .false.
logical :: ca_trigger = .false.

!--- Increment grid
logical :: increment_file_on_native_grid = .false. ! increment on native grid else Gaussian grid

!--- IAU options
real(kind=kind_phys) :: iau_delthrs = 0 !< iau time interval (to scale increments)
character(len=240) :: iau_inc_files(7) = '' !< list of increment files
Expand Down Expand Up @@ -4110,6 +4116,8 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
nseed, nseed_g, nthresh, do_ca, ca_advect, &
ca_sgs, ca_global,iseed_ca,ca_smooth, &
nspinup,ca_amplitude,nsmooth,ca_closure,ca_entr,ca_trigger, &
!--- Increment grid
increment_file_on_native_grid, &
!--- IAU
iau_delthrs,iaufhrs,iau_inc_files,iau_filter_increments, &
iau_drymassfixer, &
Expand Down