Skip to content

Feature/rtodling/these read cubed output #1074

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
sdrabenh merged 8 commits into from
Apr 16, 2025
Merged

Feature/rtodling/these read cubed output #1074

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
75e91bf
Merge pull request #1017 from GEOS-ESM/develop
sdrabenh Oct 18, 2024
f26a2d1
Merge pull request #1027 from GEOS-ESM/develop
sdrabenh Nov 5, 2024
b769e44
Merge pull request #1043 from GEOS-ESM/develop
mathomp4 Jan 9, 2025
7dac75d
Merge pull request #1048 from GEOS-ESM/develop
sdrabenh Jan 23, 2025
85bc34c
Now able to read cubed output
rtodling Mar 13, 2025
3928132
Merge branch 'develop' into feature/rtodling/these_read_cubed_output
sdrabenh Apr 15, 2025
05dadc5
Merge branch 'develop' into feature/rtodling/these_read_cubed_output
sdrabenh Apr 15, 2025
65db488
Merge branch 'develop' into feature/rtodling/these_read_cubed_output
sdrabenh Apr 15, 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
96 changes: 70 additions & 26 deletions GEOSmkiau_GridComp/GEOS_mkiauGridComp.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ module GEOS_mkiauGridCompMod
use ESMF_CFIOFileMod
use GEOS_UtilsMod
! use GEOS_RemapMod, only: myremap => remap
use MAPL_CubedSphereGridFactoryMod
use m_set_eta, only: set_eta
#ifdef PYMKIAU_INTEGRATION
use pyMKIAU_interface_mod
Expand Down Expand Up @@ -671,6 +672,7 @@ subroutine RUN ( GC, IMPORT, EXPORT, CLOCK, RC )
integer :: nymdm1,nhmsm1
integer :: nymdm2,nhmsm2
integer :: NX,NY,IMG,JMG
integer :: NX_CUBE,NY_CUBE
integer :: method
integer :: DIMS(ESMF_MAXGRIDDIM)
integer :: JCAP,LMP1
Expand All @@ -695,6 +697,9 @@ subroutine RUN ( GC, IMPORT, EXPORT, CLOCK, RC )
real :: REPLAY_O3_FACTOR
real :: REPLAY_TS_FACTOR

type (CubedSphereGridFactory) :: cs_factory
type (LatlonGridFactory) :: ll_factory

class (AbstractRegridder), pointer :: ANA2BKG => null()
class (AbstractRegridder), pointer :: BKG2ANA => null()
integer :: NPHIS, NPHIS_MAX
Expand Down Expand Up @@ -1077,30 +1082,36 @@ subroutine RUN ( GC, IMPORT, EXPORT, CLOCK, RC )
VERIFY_(STATUS)
end if

call CFIO_Open ( REPLAY_FILEP0, 1, fid, STATUS )
VERIFY_(STATUS)
call CFIO_DimInquire ( fid, IMana_World, JMana_world, LMana, nt, nvars, natts, rc=STATUS )
VERIFY_(STATUS)
call CFIO_Close ( fid, STATUS )
VERIFY_(STATUS)

call WRITE_PARALLEL("Creating GRIDana...")
write(imstr,*) IMana_World
write(jmstr,*) JMana_World
gridAnaName='PC'//trim(adjustl(imstr))//'x'//trim(adjustl(jmstr))//'-DC'

! Get grid_dimensions from file.
call CFIO_Open(REPLAY_FILEP0, 1, fid, rc=status)
VERIFY_(status)
call CFIO_DimInquire (fid, IMana_World, JMana_World, LMana, nt, nvars, natts, rc=status)
VERIFY_(status)
call CFIO_Close(fid, rc=status)
VERIFY_(status)
if ( JMana_world == 6*IMana_World ) then

block
use MAPL_LatLonGridFactoryMod
GRIDrep = grid_manager%make_grid( &
LatLonGridFactory(im_world=IMana_World, jm_world=JMana_World, lm=LMana, &
nx=NX, ny=NY, pole='PC', dateline= 'DC', rc=status) )
VERIFY_(STATUS)
GRIDana = grid_manager%make_grid( &
LatLonGridFactory(im_world=IMana_World, jm_world=JMana_World, lm=LMbkg, &
nx=NX, ny=NY, pole='PC', dateline= 'DC', rc=status) )
VERIFY_(STATUS)
end block
call MAPL_MakeDecomposition(NX_CUBE,NY_CUBE,reduceFactor=6,__RC__)
cs_factory = CubedSphereGridFactory(im_world=IMana_World,lm=LMana,nx=nx_cube,ny=ny_cube,__RC__)
GRIDana = grid_manager%make_grid(cs_factory,__RC__)
GRIDrep = grid_manager%make_grid(cs_factory,__RC__)

else

block
class(AbstractGridFactory), allocatable :: factory
allocate(factory, source = grid_manager%make_factory(trim(REPLAY_FILEP0),force_file_coordinates = .false.))
GRIDrep = grid_manager%make_grid(factory)
GRIDana = grid_manager%make_grid(factory)
end block

endif

mkiau_internal_state%im = IMana_World
mkiau_internal_state%jm = JMana_World
Expand Down Expand Up @@ -1223,7 +1234,7 @@ subroutine handleINC_
VERIFY_(STATUS)
call ESMF_FieldBundleSet(RBUNDLEP0, grid=GRIDana, rc=status)
VERIFY_(STATUS)
call MAPL_CFIORead ( REPLAY_FILEP0, REPLAY_TIMEP0, RBUNDLEP0, RC=status)
call MAPL_read_bundle( RBUNDLEP0, REPLAY_FILEP0, REPLAY_TIMEP0, RC=status)
VERIFY_(STATUS)
call ESMF_FieldBundleGet ( RBUNDLEP0, fieldCount=NQ, RC=STATUS )
VERIFY_(STATUS)
Expand Down Expand Up @@ -1513,13 +1524,13 @@ subroutine handleANA_
if ( trim(GRIDINC)=="ANA" ) call ESMF_FieldBundleSet(RBUNDLEP0, grid=GRIDrep, rc=status)
if ( trim(GRIDINC)=="BKG" ) call ESMF_FieldBundleSet(RBUNDLEP0, grid=GRIDbkg, rc=status)
VERIFY_(STATUS)
call MAPL_CFIORead ( REPLAY_FILEP0, REPLAY_TIMEP0, RBUNDLEP0 , RC=status)
call MAPL_read_bundle( RBUNDLEP0, REPLAY_FILEP0, REPLAY_TIMEP0, RC=status)
VERIFY_(STATUS)
FILEP0 = REPLAY_FILEP0
FILE_TIMEP0 = REPLAY_TIMEP0
NEED_BUNDLEP0 = .FALSE.
else if( (FILE_TIMEP0 .ne. REPLAY_TIMEP0) .or. (FILEP0 .ne. REPLAY_FILEP0) ) then
call MAPL_CFIORead ( REPLAY_FILEP0, REPLAY_TIMEP0, RBUNDLEP0 , RC=status)
call MAPL_read_bundle( RBUNDLEP0, REPLAY_FILEP0, REPLAY_TIMEP0, RC=status)
VERIFY_(STATUS)
FILEP0 = REPLAY_FILEP0
FILE_TIMEP0 = REPLAY_TIMEP0
Expand All @@ -1532,13 +1543,13 @@ subroutine handleANA_
if ( trim(GRIDINC)=="ANA" ) call ESMF_FieldBundleSet(RBUNDLEM1, grid=GRIDrep, rc=status)
if ( trim(GRIDINC)=="BKG" ) call ESMF_FieldBundleSet(RBUNDLEM1, grid=GRIDbkg, rc=status)
VERIFY_(STATUS)
call MAPL_CFIORead ( REPLAY_FILEM1, REPLAY_TIMEM1, RBUNDLEM1 , RC=status)
call MAPL_read_bundle( RBUNDLEM1, REPLAY_FILEM1, REPLAY_TIMEM1, RC=status)
VERIFY_(STATUS)
FILEM1 = REPLAY_FILEM1
FILE_TIMEM1 = REPLAY_TIMEM1
NEED_BUNDLEM1 = .FALSE.
else if ( (FILE_TIMEM1 .ne. REPLAY_TIMEM1) .or. (FILEM1 .ne. REPLAY_FILEM1) ) then
call MAPL_CFIORead ( REPLAY_FILEM1, REPLAY_TIMEM1, RBUNDLEM1 , RC=status)
call MAPL_read_bundle( RBUNDLEM1, REPLAY_FILEM1, REPLAY_TIMEM1, RC=status)
VERIFY_(STATUS)
FILEM1 = REPLAY_FILEM1
FILE_TIMEM1 = REPLAY_TIMEM1
Expand All @@ -1551,13 +1562,13 @@ subroutine handleANA_
if ( trim(GRIDINC)=="ANA" ) call ESMF_FieldBundleSet(RBUNDLEP1, grid=GRIDrep, rc=status)
if ( trim(GRIDINC)=="BKG" ) call ESMF_FieldBundleSet(RBUNDLEP1, grid=GRIDbkg, rc=status)
VERIFY_(STATUS)
call MAPL_CFIORead ( REPLAY_FILEP1, REPLAY_TIMEP1, RBUNDLEP1 , RC=status)
call MAPL_read_bundle( RBUNDLEP1, REPLAY_FILEP1, REPLAY_TIMEP1, RC=status)
VERIFY_(STATUS)
FILEP1 = REPLAY_FILEP1
FILE_TIMEP1 = REPLAY_TIMEP1
NEED_BUNDLEP1 = .FALSE.
else if ( FILE_TIMEP1 .ne. REPLAY_TIMEP1 .or. (FILEP1 .ne. REPLAY_FILEP1) ) then
call MAPL_CFIORead ( REPLAY_FILEP1, REPLAY_TIMEP1, RBUNDLEP1 , RC=status)
call MAPL_read_bundle( RBUNDLEP1, REPLAY_FILEP1, REPLAY_TIMEP1, RC=status)
VERIFY_(STATUS)
FILEP1 = REPLAY_FILEP1
FILE_TIMEP1 = REPLAY_TIMEP1
Expand All @@ -1569,13 +1580,13 @@ subroutine handleANA_
if ( trim(GRIDINC)=="ANA" ) call ESMF_FieldBundleSet(RBUNDLEM2, grid=GRIDrep, rc=status)
if ( trim(GRIDINC)=="BKG" ) call ESMF_FieldBundleSet(RBUNDLEM2, grid=GRIDbkg, rc=status)
VERIFY_(STATUS)
call MAPL_CFIORead ( REPLAY_FILEM2, REPLAY_TIMEM2, RBUNDLEM2 , RC=status)
call MAPL_read_bundle( RBUNDLEM2, REPLAY_FILEM2, REPLAY_TIMEM2, RC=status)
VERIFY_(STATUS)
FILEM2 = REPLAY_FILEM2
FILE_TIMEM2 = REPLAY_TIMEM2
NEED_BUNDLEM2 = .FALSE.
else if ( FILE_TIMEM2 .ne. REPLAY_TIMEM2 .or. (FILEM2 .ne. REPLAY_FILEM2) ) then
call MAPL_CFIORead ( REPLAY_FILEM2, REPLAY_TIMEM2, RBUNDLEM2 , RC=status)
call MAPL_read_bundle( RBUNDLEM2, REPLAY_FILEM2, REPLAY_TIMEM2, RC=status)
VERIFY_(STATUS)
FILEM2 = REPLAY_FILEM2
FILE_TIMEM2 = REPLAY_TIMEM2
Expand All @@ -1591,6 +1602,7 @@ subroutine handleANA_
VERIFY_(STATUS)
call ESMF_FieldBundleGet ( RBUNDLEP0, fieldNameList=RNAMES, rc=STATUS )
VERIFY_(STATUS)
call RedanduncyCheck(RNAMES)
if( first ) then
if(MAPL_AM_I_ROOT() ) then
print *
Expand Down Expand Up @@ -2863,11 +2875,13 @@ function match (replay_name,replay_alias,replay_var)

if( trim(name) == 'U' ) then
if( trim(var) == 'U' ) match = .true.
if( trim(var) == 'UA' ) match = .true.
if( trim(var) == 'UGRD' ) match = .true.
endif

if( trim(name) == 'V' ) then
if( trim(var) == 'V' ) match = .true.
if( trim(var) == 'VA' ) match = .true.
if( trim(var) == 'VGRD' ) match = .true.
endif

Expand Down Expand Up @@ -2907,6 +2921,7 @@ function match (replay_name,replay_alias,replay_var)

if( trim(name) == 'O3' ) then
if( trim(var) == 'O3' ) match = .true.
if( trim(var) == 'O3PPMV' ) match = .true.
if( trim(var) == 'OZONE' ) match = .true.
endif

Expand Down Expand Up @@ -3410,4 +3425,33 @@ subroutine myremap ( ple_in,ple_out, &
return
end subroutine myremap

subroutine RedanduncyCheck(rnames)

character(len=*), intent(inout) :: rnames(:)
! completely wired
! at the moment, the files generated for/by JEDI
! largely ignore GEOS naming convensions, this
! here a paliative to a solution/clean-up to come
! in the future (Todling).

! when both t and tv are in file, bypass t
if (any(rnames=='t') .and. any(rnames=='tv')) then
where(rnames=='t')
rnames = 't-bypass'
endwhere
endif
! when both u and ua are in file, bypass u
if (any(rnames=='u') .and. any(rnames=='ua')) then
where(rnames=='u')
rnames = 'u-bypass'
endwhere
endif
! when both v and va are in file, bypass v
if (any(rnames=='v') .and. any(rnames=='va')) then
where(rnames=='v')
rnames = 'v-bypass'
endwhere
endif
end subroutine RedanduncyCheck

end module GEOS_mkiauGridCompMod