Skip to content

Upgrade WM to spack-stack 2.1.0 #410

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

Draft
gspetro-NOAA wants to merge 2 commits into
base: dev/emc
Choose a base branch
from
+6 −28
Draft

Upgrade WM to spack-stack 2.1.0 #410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
569fc02
rm sst_ncep & sst_anom
gspetro-NOAA Apr 2, 2026
b46bf1c
Merge branch 'dev/emc' of https://github.com/NOAA-GFDL/GFDL_atmos_cub…
gspetro-NOAA Apr 16, 2026
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
10 changes: 1 addition & 9 deletions model/fv_grid_utils.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ module fv_grid_utils_mod
#include <fms_platform.h>
use constants_mod, only: omega, pi=>pi_8, cnst_radius=>radius
use mpp_mod, only: FATAL, mpp_error, WARNING
use external_sst_mod, only: i_sst, j_sst, sst_ncep, sst_anom
use external_sst_mod, only: i_sst, j_sst
use mpp_domains_mod, only: mpp_update_domains, DGRID_NE, mpp_global_sum
use mpp_domains_mod, only: BITWISE_EXACT_SUM, domain2d, BITWISE_EFP_SUM
use mpp_parameter_mod, only: AGRID_PARAM=>AGRID, CGRID_NE_PARAM=>CGRID_NE
Expand Down Expand Up @@ -277,12 +277,6 @@ subroutine grid_utils_init(Atm, npx, npy, npz, non_ortho, grid_type, c2l_order)
endif
endif

! NCEP analysis available from amip-Interp (allocate if needed)
#ifndef DYCORE_SOLO
if (.not. allocated(sst_ncep)) allocate (sst_ncep(i_sst,j_sst))
if (.not. allocated(sst_anom)) allocate (sst_anom(i_sst,j_sst))
#endif


cos_sg(:,:,:) = big_number
sin_sg(:,:,:) = tiny_number
Expand Down Expand Up @@ -989,8 +983,6 @@ subroutine grid_utils_end

! deallocate sst_ncep (if allocated)
#ifndef DYCORE_SOLO
if (allocated(sst_ncep)) deallocate( sst_ncep )
if (allocated(sst_anom)) deallocate( sst_anom )
#endif
end subroutine grid_utils_end

Expand Down
9 changes: 1 addition & 8 deletions tools/external_ic.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ module external_ic_mod
! </table>

use netcdf
use external_sst_mod, only: i_sst, j_sst, sst_ncep
use external_sst_mod, only: i_sst, j_sst
use fms_mod, only: write_version_number, check_nml_error
use fms2_io_mod, only: file_exists, open_file, close_file, read_data, variable_exists, &
get_variable_size, get_global_attribute, global_att_exists, &
Expand Down Expand Up @@ -1672,10 +1672,6 @@ subroutine get_ncep_ic( Atm, nq )
! Perform interp to FMS SST format/grid
#ifndef DYCORE_SOLO
call ncep2fms(im, jm, lon, lat, wk2)
if( is_master() ) then
write(*,*) 'External_ic_mod: i_sst=', i_sst, ' j_sst=', j_sst
call pmaxmin( 'SST_ncep_fms', real(sst_ncep), i_sst, j_sst, 1.)
endif
#endif
endif !(read_ts)

Expand Down Expand Up @@ -2871,9 +2867,6 @@ subroutine ncep2fms(im, jm, lon, lat, wk)
c2 = a1 * (1.-b1)
c3 = a1 * b1
c4 = (1.-a1) * b1
! Interpolated surface pressure
sst_ncep(i,j) = c1*wk(i1,jc ) + c2*wk(i2,jc ) + &
c3*wk(i2,jc+1) + c4*wk(i1,jc+1)
enddo !i-loop
5000 continue ! j-loop

Expand Down
6 changes: 2 additions & 4 deletions tools/external_sst.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,10 @@ module external_sst_mod
integer :: j_sst = -1
logical :: forecast_mode = .false.
logical :: use_ncep_sst = .false.
real, allocatable, dimension(:,:) :: sst_ncep, sst_anom
#else
use amip_interp_mod, only: i_sst, j_sst, sst_ncep, sst_anom, &
forecast_mode, use_ncep_sst
use amip_interp_mod, only: i_sst, j_sst,forecast_mode, use_ncep_sst
#endif

public i_sst, j_sst, sst_ncep, sst_anom, forecast_mode, use_ncep_sst
public i_sst, j_sst, forecast_mode, use_ncep_sst

end module external_sst_mod
2 changes: 1 addition & 1 deletion tools/fv_io.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ module fv_io_mod
set_tracer_profile, &
get_tracer_index
use field_manager_mod, only: MODEL_ATMOS
use external_sst_mod, only: sst_ncep, sst_anom, use_ncep_sst
use external_sst_mod, only: use_ncep_sst
use fv_arrays_mod, only: fv_atmos_type, fv_nest_BC_type_3D
use fv_eta_mod, only: set_external_eta

Expand Down
7 changes: 1 addition & 6 deletions tools/fv_nudge.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ module fv_nwp_nudge_mod
! </tr>
! </table>

use external_sst_mod, only: i_sst, j_sst, sst_ncep, sst_anom, forecast_mode
use external_sst_mod, only: i_sst, j_sst, forecast_mode
use diag_manager_mod, only: register_diag_field, send_data
#ifdef OVERLOAD_R4
use constantsR4_mod, only: pi=>pi_8, grav, rdgas, cp_air, kappa, cnst_radius =>radius
Expand Down Expand Up @@ -1659,8 +1659,6 @@ subroutine get_ncep_analysis ( ps, u, v, t, q, zvir, ts, nfile, fname, bd )
#ifndef DYCORE_SOLO
! Perform interp to FMS SST format/grid
call ncep2fms( wk1 )
if(master) call pmaxmin( 'SST_ncep', real(sst_ncep), i_sst, j_sst, 1.)
! if(nfile/=1 .and. master) call pmaxmin( 'SST_anom', sst_anom, i_sst, j_sst, 1.)
#endif
deallocate ( wk1 )
if (master) write(*,*) 'Done processing NCEP SST'
Expand Down Expand Up @@ -1957,9 +1955,6 @@ subroutine ncep2fms( sst )
c2 = a1 * (1.-b1)
c3 = a1 * b1
c4 = (1.-a1) * b1
! Interpolated surface pressure
sst_ncep(i,j) = c1*sst(i1,jc ) + c2*sst(i2,jc ) + &
c3*sst(i2,jc+1) + c4*sst(i1,jc+1)
enddo !i-loop
5000 continue ! j-loop

Expand Down