Merge pull request #222 from GEOS-ESM/feature/rtodling/bring_back_pr209

Feature/rtodling/bring back pr209

Author: rtodling

CHANGELOG.md

@@ -11,6 +11,21 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+28Jan2026:
+- bring back changes from PR #209
+
+28Jan2026:
+- bug fix: add ABI tlapmean back (had lost them when backing out PR#209)
+- another miss (qcmod) wrt ABI and IR back out
+
+12Jan2026:
+- bug fixes in interfacing GSI w/ libSP - these are zero-diff fixes
+
+09Jan2026:
+- Back out changes from PR 209 (IR adjustments) since this is 
+  aimed at FPP and the update must be zero-diff.
+- optional write out in setupw
+
 07Jan2026:
 - minor revisions of CG tolerance (consistency between pcgsoi and bicg)
 

GEOSaana_GridComp/GSI_GridComp/general_specmod.f90

@@ -7,16 +7,16 @@ module general_specmod
 ! abstract: copy of specmod, introducing structure variable spec_vars, so
 !             spectral code can be used for arbitrary resolutions.
 !
-! program history log:   
+! program history log:
 !   2003-11-24  treadon
 !   2004-04-28  d. kokron, updated SGI's fft to use scsl
 !   2004-05-18  kleist, documentation
-!   2004-08-27  treadon - add/initialize variables/arrays needed by 
-!                         splib routines for grid <---> spectral 
+!   2004-08-27  treadon - add/initialize variables/arrays needed by
+!                         splib routines for grid <---> spectral
 !                         transforms
 !   2007-04-26  yang    - based on idrt value xxxx descriptionxxx
 !   2010-02-18  parrish - copy specmod to general_specmod and add structure variable spec_vars.
-!                           remove all *_b variables, since now not necessary to have two 
+!                           remove all *_b variables, since now not necessary to have two
 !                           resolutions.  any number of resolutions can be now contained in
 !                           type(spec_vars) variables passed in through init_spec_vars.  also
 !                           remove init_spec, since not really necessary.
@@ -127,7 +127,7 @@ subroutine general_init_spec_vars(sp,jcap,jcap_test,nlat_a,nlon_a,eqspace)
 ! program history log:
 !   2003-11-24  treadon
 !   2004-05-18  kleist, new variables and documentation
-!   2004-08-27  treadon - add call to sptranf0 and associated arrays, 
+!   2004-08-27  treadon - add call to sptranf0 and associated arrays,
 !                         remove del21 and other unused arrays/variables
 !   2006-04-06  middlecoff - remove jc=ncpus() since not used
 !   2008-04-11  safford    - rm unused vars
@@ -137,7 +137,7 @@ subroutine general_init_spec_vars(sp,jcap,jcap_test,nlat_a,nlon_a,eqspace)
 !   2013-10-23  el akkraoui - initialize lats to zero (otherwise point is undefined)
 !
 !   input argument list:
-!     sp     - type(spec_vars) variable 
+!     sp     - type(spec_vars) variable
 !     jcap   - target resolution
 !     jcap_test - test resolution,  used to construct mask which will zero out coefs
 !                  with total wavenumber n in range jcap_test < n <= jcap
@@ -161,13 +161,15 @@ subroutine general_init_spec_vars(sp,jcap,jcap_test,nlat_a,nlon_a,eqspace)
     integer(i_kind) ,intent(in   ) :: jcap,jcap_test,nlat_a,nlon_a
     logical,optional,intent(in   ) :: eqspace
 
-!   Declare local variables    
+!   Declare local variables
     integer(i_kind) i,ii1,j,l,m,jhe,n
     integer(i_kind) :: ldafft
     real(r_kind) :: dlon_a,half_pi,two_pi
     real(r_kind),dimension(nlat_a-2) :: wlatx,slatx
     real(r_kind) :: epsi0(0:jcap)  ! epsilon factor for m=0
     real(r_kind) :: fnum, fden
+    real(r_kind), dimension(:, :), allocatable :: dummy_w
+    real(r_kind), dimension(:, :), allocatable :: dummy_g
 
 !   Set constants used in transforms for analysis grid
     sp%jcap=jcap
@@ -191,7 +193,6 @@ subroutine general_init_spec_vars(sp,jcap,jcap_test,nlat_a,nlon_a,eqspace)
     sp%je=(sp%jmax+1)/2
 
 
-
 !   Allocate and initialize fact arrays
     if(sp%lallocated) then
        deallocate(sp%factsml,sp%factvml,sp%eps,sp%epstop,sp%enn1,sp%elonn1,sp%eon,sp%eontop)
@@ -229,11 +230,17 @@ subroutine general_init_spec_vars(sp,jcap,jcap_test,nlat_a,nlon_a,eqspace)
     ldafft=50000+4*sp%imax ! ldafft=256+imax would be sufficient at GMAO.
     allocate( sp%afft(ldafft))
     allocate( sp%clat(sp%jb:sp%je) )
-    allocate( sp%slat(sp%jb:sp%je) ) 
-    allocate( sp%wlat(sp%jb:sp%je) ) 
+    allocate( sp%slat(sp%jb:sp%je) )
+    allocate( sp%wlat(sp%jb:sp%je) )
     call spwget(sp%iromb,sp%jcap,sp%eps,sp%epstop,sp%enn1, &
           sp%elonn1,sp%eon,sp%eontop)
-    call spffte(sp%imax,(sp%imax+2)/2,sp%imax,2,0.,0.,0,sp%afft)
+! Allocate dummy_w and dummy_g arrays for spffte (unused, but required by spffte)
+    allocate(dummy_w((sp%imax+2)/2,2), dummy_g(sp%imax,2))
+    dummy_w=zero
+    dummy_g=zero
+    call spffte(sp%imax,(sp%imax+2)/2,sp%imax,2,dummy_w,dummy_g,0,sp%afft)
+    if(allocated(dummy_w)) deallocate(dummy_w)
+    if(allocated(dummy_g)) deallocate(dummy_g)
     call splat(sp%idrt,sp%jmax,slatx,wlatx)
     jhe=(sp%jmax+1)/2
     if(jhe > sp%jmax/2)wlatx(jhe)=wlatx(jhe)/2
@@ -248,14 +255,14 @@ subroutine general_init_spec_vars(sp,jcap,jcap_test,nlat_a,nlon_a,eqspace)
       allocate( sp%plntop(sp%jcap+1,sp%jb:sp%je) )
       do j=sp%jb,sp%je
         call splegend(sp%iromb,sp%jcap,sp%slat(j),sp%clat(j),sp%eps, &
-          sp%epstop,sp%pln(1,j),sp%plntop(1,j))
+          sp%epstop,sp%pln(:,j),sp%plntop(:,j))
       end do
     else
       sp%precalc_pln=.false.
       allocate( sp%pln(sp%ncd2,1) )
       allocate( sp%plntop(sp%jcap+1,1) )
     end if
-      
+
 !     obtain rlats and rlons
     half_pi=half*pi
     two_pi=two*pi