Merge remote-tracking branch 'upstream/develop' into feature/ufs_fire…

…_cpl
NOAA-EMC · Aug 27, 2024 · b1ea562 · b1ea562
2 parents 18ffde8 + 70b3065
commit b1ea562
Show file tree

Hide file tree

Showing 6 changed files with 208 additions and 42 deletions.
diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere
diff --git a/atmos_model.F90 b/atmos_model.F90
@@ -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
@@ -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()

diff --git a/ccpp/data/GFS_typedefs.F90 b/ccpp/data/GFS_typedefs.F90
@@ -1613,6 +1613,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
@@ -3907,6 +3910,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
@@ -4128,6 +4134,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,                                            &

diff --git a/ci/spack.yaml b/ci/spack.yaml
@@ -11,14 +11,17 @@
 # Alex Richert, 6 Dec 2023
 spack:
   specs:
-  - w3emc@2.10.0 precision=4,d,8
-  - ip@develop precision=4,d,8
-  - sp@2.4.0 precision=4,d,8
   - bacio@2.4.1
-  - upp@develop
-  - esmf@8.4.2
+  - crtm@2.4.0
+  - esmf@8.6.0
   - fms@2023.04 +gfs_phys +openmp +pic +quad_precision +deprecated_io constants=GFS precision=32,64
+  - g2@3.5.1
+  - g2tmpl@1.13.0
+  - ip@4.3.0 precision=4,d,8
   - netcdf-c@4.9.2 ~blosc
+  - netcdf-fortran@4.6.1
+  - sp@2.5.0 precision=4,d,8
+  - w3emc@2.10.0 precision=4,d,8
   view: false
   concretizer:
     unify: true
+2 −1		CMakeLists.txt
+1 −0		model/fv_arrays.F90
+3 −3		model/fv_control.F90
+66 −0		tools/cubed_sphere_inc_mod.F90
+23 −16		tools/fv_iau_mod.F90
+15 −7		tools/fv_restart.F90
+196 −4		tools/fv_treat_da_inc.F90