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.

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

Ocean currents variable change from C-grid to A-grid and vice versa #43

Merged
merged 13 commits into from
Dec 27, 2024
Merged

Ocean currents variable change from C-grid to A-grid and vice versa #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
a4bd5c1
Ocean currents variable change from C-grid to A-grid and vice versa
hga007 Nov 16, 2024
78cdff9
Merging latest develop into feature/uv_agrid
hga007 Nov 17, 2024
87612b9
Updating writing of A-grid velocities
hga007 Nov 19, 2024
deaf69b
Updated currents variable change froms C-grid to A-grid
hga007 Nov 21, 2024
c48dfbb
Corrected MPI bug in Grid Decimation
hga007 Dec 12, 2024
5801736
Updated statter routines
hga007 Dec 12, 2024
3422e43
Merging latest feature/mpi into feature/uv_agrid
hga007 Dec 13, 2024
e96e5e7
Merging latest develop into feature/uv_agrid
hga007 Dec 14, 2024
11441eb
Updated logic for FORWARD_MIXING when using ROMS-JEDI
hga007 Dec 15, 2024
37ac72a
Updated central CMakelist.txt
hga007 Dec 16, 2024
8d12c1c
Corrected compiling issue in 2D applications
hga007 Dec 21, 2024
f1c22ad
Corrected adjoint lateral boundaries C2A_grid
hga007 Dec 21, 2024
cc16366
Added option UV_DESTAGGERED
hga007 Dec 26, 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
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ if( NOT IN_ECBUILD )
# Set Fortran modules directory when not using ecbuild. It is set
# automatically when using ecbuild.

set( CMAKE_Fortran_MODULE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/modules" )
set( CMAKE_Fortran_MODULE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/module" )
set( CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE )
set( CMAKE_SKIP_BUILD_RPATH FALSE )

Expand Down
454 changes: 295 additions & 159 deletions ROMS/Adjoint/ad_def_his.F
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions ROMS/Adjoint/ad_post_initial.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,13 @@ MODULE ad_post_initial_mod
# endif
!
USE ini_fields_mod, ONLY : set_zeta_timeavg
# ifdef SOLVE3D
USE set_depth_mod, ONLY : set_depth
# endif
USE ad_ini_fields_mod, ONLY : ad_ini_fields, ad_ini_zeta
# ifdef SOLVE3D
USE ad_set_depth_mod, ONLY : ad_set_depth
# endif
!
implicit none
!
Expand Down
59 changes: 37 additions & 22 deletions ROMS/Adjoint/ad_step3d_uv.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,30 @@ MODULE ad_step3d_uv_mod
! Qsrc !
! !
!=======================================================================
!
USE mod_param
USE mod_coupling
# ifdef DIAGNOSTICS_UV
!! USE mod_diags
# endif
USE mod_forces
USE mod_grid
USE mod_mixing
USE mod_ocean
USE mod_scalars
USE mod_sources
!
USE ad_exchange_2d_mod
USE ad_exchange_3d_mod
USE exchange_3d_mod
# ifdef DISTRIBUTE
USE mp_exchange_mod, ONLY : ad_mp_exchange2d, ad_mp_exchange3d
# endif
USE ad_u3dbc_mod, ONLY : ad_u3dbc_tile
USE ad_v3dbc_mod, ONLY : ad_v3dbc_tile
# ifdef UV_DESTAGGERED
USE uv_var_change_mod, ONLY : ad_uv_C2A_grid
# endif
!
implicit none
!
Expand All @@ -32,15 +56,6 @@ MODULE ad_step3d_uv_mod
SUBROUTINE ad_step3d_uv (ng, tile)
!***********************************************************************
!
USE mod_param
USE mod_coupling
# ifdef DIAGNOSTICS_UV
!! USE mod_diags
# endif
USE mod_forces
USE mod_grid
USE mod_mixing
USE mod_ocean
USE mod_stepping
!
! Imported variable declarations.
Expand Down Expand Up @@ -177,19 +192,6 @@ SUBROUTINE ad_step3d_uv_tile (ng, tile, &
& Huon, ad_Huon, &
& Hvom, ad_Hvom)
!***********************************************************************
!
USE mod_param
USE mod_scalars
USE mod_sources
!
USE ad_exchange_2d_mod
USE ad_exchange_3d_mod
USE exchange_3d_mod
# ifdef DISTRIBUTE
USE mp_exchange_mod, ONLY : ad_mp_exchange2d, ad_mp_exchange3d
# endif
USE ad_u3dbc_mod, ONLY : ad_u3dbc_tile
USE ad_v3dbc_mod, ONLY : ad_v3dbc_tile
!
! Imported variable declarations.
!
Expand Down Expand Up @@ -411,6 +413,19 @@ SUBROUTINE ad_step3d_uv_tile (ng, tile, &
ad_oHz(i,k)=0.0_r8
END DO
END DO

# ifdef UV_DESTAGGERED
!
!-----------------------------------------------------------------------
! Compute adjoint 3D momentum (ad_ua, ad_va) at RHO-points (A-Grid)
! for output purposes and data assimilation where the observations
! and state vector is located at the cell-center.
!-----------------------------------------------------------------------
!
!> CALL tl_uv_C2A_grid (ng, tile, iTLM, nnew)
!>
CALL ad_uv_C2A_grid (ng, tile, iTLM, nnew)
# endif
!
!-----------------------------------------------------------------------
! Exchange boundary data.
Expand Down
279 changes: 191 additions & 88 deletions ROMS/Adjoint/ad_wrt_his.F
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion ROMS/Include/globaldefs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -547,7 +547,9 @@
(defined LMD_MIXING || \
defined GLS_MIXING || \
defined MY25_MIXING)
/* # define FORWARD_MIXING */
# if !defined JEDI
define FORWARD_MIXING
# endif
#endif

/*
Expand Down
35 changes: 35 additions & 0 deletions ROMS/Modules/mod_ocean.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@ MODULE mod_ocean
! rv Right hand side of 3D V-momentum equation (m4/s2). !
! t Tracer type variables (active and passive). !
! u 3D U-momentum component (m/s). !
! ua 3D U-momentun component (m/s) at RHO-points, A-grid. !
! v 3D V-momentum component (m/s). !
! va 3D U-momentun component (m/s) at RHO-points, A-grid. !
! W S-coordinate (omega*Hz/mn) vertical velocity (m3/s). !
#ifdef BIOLOGY
! !
Expand Down Expand Up @@ -109,7 +111,9 @@ MODULE mod_ocean
real(r8), pointer :: rv(:,:,:,:)
real(r8), pointer :: t(:,:,:,:,:)
real(r8), pointer :: u(:,:,:,:)
real(r8), pointer :: ua(:,:,:)
real(r8), pointer :: v(:,:,:,:)
real(r8), pointer :: va(:,:,:)
real(r8), pointer :: W(:,:,:)
# if defined OMEGA_IMPLICIT
real(r8), pointer :: Wi(:,:,:)
Expand Down Expand Up @@ -171,7 +175,9 @@ MODULE mod_ocean
real(r8), pointer :: tl_rv(:,:,:,:)
real(r8), pointer :: tl_t(:,:,:,:,:)
real(r8), pointer :: tl_u(:,:,:,:)
real(r8), pointer :: tl_ua(:,:,:)
real(r8), pointer :: tl_v(:,:,:,:)
real(r8), pointer :: tl_va(:,:,:)
real(r8), pointer :: tl_W(:,:,:)
# if defined OMEGA_IMPLICIT
real(r8), pointer :: tl_Wi(:,:,:)
Expand Down Expand Up @@ -220,7 +226,9 @@ MODULE mod_ocean
real(r8), pointer :: ad_rv(:,:,:,:)
real(r8), pointer :: ad_t(:,:,:,:,:)
real(r8), pointer :: ad_u(:,:,:,:)
real(r8), pointer :: ad_ua(:,:,:)
real(r8), pointer :: ad_v(:,:,:,:)
real(r8), pointer :: ad_va(:,:,:)
real(r8), pointer :: ad_W(:,:,:)
real(r8), pointer :: ad_wvel(:,:,:)

Expand Down Expand Up @@ -434,9 +442,15 @@ SUBROUTINE allocate_ocean (ng, LBi, UBi, LBj, UBj)
allocate ( OCEAN(ng) % u(LBi:UBi,LBj:UBj,N(ng),2) )
Dmem(ng)=Dmem(ng)+2.0_r8*REAL(N(ng),r8)*size2d

allocate ( OCEAN(ng) % ua(LBi:UBi,LBj:UBj,N(ng)) )
Dmem(ng)=Dmem(ng)+REAL(N(ng),r8)*size2d

allocate ( OCEAN(ng) % v(LBi:UBi,LBj:UBj,N(ng),2) )
Dmem(ng)=Dmem(ng)+2.0_r8*REAL(N(ng),r8)*size2d

allocate ( OCEAN(ng) % va(LBi:UBi,LBj:UBj,N(ng)) )
Dmem(ng)=Dmem(ng)+REAL(N(ng),r8)*size2d

allocate ( OCEAN(ng) % W(LBi:UBi,LBj:UBj,0:N(ng)) )
Dmem(ng)=Dmem(ng)+REAL(N(ng)+1,r8)*size2d

Expand Down Expand Up @@ -565,9 +579,15 @@ SUBROUTINE allocate_ocean (ng, LBi, UBi, LBj, UBj)
allocate ( OCEAN(ng) % tl_u(LBi:UBi,LBj:UBj,N(ng),2) )
Dmem(ng)=Dmem(ng)+2.0_r8*REAL(N(ng),r8)*size2d

allocate ( OCEAN(ng) % tl_ua(LBi:UBi,LBj:UBj,N(ng)) )
Dmem(ng)=Dmem(ng)+REAL(N(ng),r8)*size2d

allocate ( OCEAN(ng) % tl_v(LBi:UBi,LBj:UBj,N(ng),2) )
Dmem(ng)=Dmem(ng)+2.0_r8*REAL(N(ng),r8)*size2d

allocate ( OCEAN(ng) % tl_va(LBi:UBi,LBj:UBj,N(ng)) )
Dmem(ng)=Dmem(ng)+REAL(N(ng),r8)*size2d

allocate ( OCEAN(ng) % tl_W(LBi:UBi,LBj:UBj,0:N(ng)) )
Dmem(ng)=Dmem(ng)+REAL(N(ng)+1,r8)*size2d

Expand Down Expand Up @@ -671,9 +691,15 @@ SUBROUTINE allocate_ocean (ng, LBi, UBi, LBj, UBj)
allocate ( OCEAN(ng) % ad_u(LBi:UBi,LBj:UBj,N(ng),2) )
Dmem(ng)=Dmem(ng)+2.0_r8*REAL(N(ng),r8)*size2d

allocate ( OCEAN(ng) % ad_ua(LBi:UBi,LBj:UBj,N(ng)) )
Dmem(ng)=Dmem(ng)+REAL(N(ng),r8)*size2d

allocate ( OCEAN(ng) % ad_v(LBi:UBi,LBj:UBj,N(ng),2) )
Dmem(ng)=Dmem(ng)+2.0_r8*REAL(N(ng),r8)*size2d

allocate ( OCEAN(ng) % ad_va(LBi:UBi,LBj:UBj,N(ng)) )
Dmem(ng)=Dmem(ng)+REAL(N(ng),r8)*size2d

allocate ( OCEAN(ng) % ad_W(LBi:UBi,LBj:UBj,0:N(ng)) )
Dmem(ng)=Dmem(ng)+REAL(N(ng)+1,r8)*size2d

Expand Down Expand Up @@ -1004,6 +1030,9 @@ SUBROUTINE deallocate_ocean (ng)
IF (.not.destroy(ng, OCEAN(ng)%t, MyFile, &
& __LINE__, 'OCEAN(ng)%t')) RETURN

IF (.not.destroy(ng, OCEAN(ng)%ua, MyFile, &
& __LINE__, 'OCEAN(ng)%u')) RETURN

IF (.not.destroy(ng, OCEAN(ng)%u, MyFile, &
& __LINE__, 'OCEAN(ng)%u')) RETURN

Expand Down Expand Up @@ -1610,8 +1639,10 @@ SUBROUTINE initialize_ocean (ng, tile, model)

OCEAN(ng) % u(i,j,k,1) = IniVal
OCEAN(ng) % u(i,j,k,2) = IniVal
OCEAN(ng) % ua(i,j,k) = IniVal
OCEAN(ng) % v(i,j,k,1) = IniVal
OCEAN(ng) % v(i,j,k,2) = IniVal
OCEAN(ng) % va(i,j,k) = IniVal
# if defined WEC
OCEAN(ng) % u_stokes(i,j,k) = IniVal
OCEAN(ng) % v_stokes(i,j,k) = IniVal
Expand Down Expand Up @@ -1715,8 +1746,10 @@ SUBROUTINE initialize_ocean (ng, tile, model)

OCEAN(ng) % tl_u(i,j,k,1) = IniVal
OCEAN(ng) % tl_u(i,j,k,2) = IniVal
OCEAN(ng) % tl_ua(i,j,k) = IniVal
OCEAN(ng) % tl_v(i,j,k,1) = IniVal
OCEAN(ng) % tl_v(i,j,k,2) = IniVal
OCEAN(ng) % tl_va(i,j,k) = IniVal
# if defined FORCING_SV || defined HESSIAN_FSV
OCEAN(ng) % f_u(i,j,k) = IniVal
OCEAN(ng) % f_v(i,j,k) = IniVal
Expand Down Expand Up @@ -1821,8 +1854,10 @@ SUBROUTINE initialize_ocean (ng, tile, model)

OCEAN(ng) % ad_u(i,j,k,1) = IniVal
OCEAN(ng) % ad_u(i,j,k,2) = IniVal
OCEAN(ng) % ad_ua(i,j,k) = IniVal
OCEAN(ng) % ad_v(i,j,k,1) = IniVal
OCEAN(ng) % ad_v(i,j,k,2) = IniVal
OCEAN(ng) % ad_va(i,j,k) = IniVal
OCEAN(ng) % ad_u_sol(i,j,k) = IniVal
OCEAN(ng) % ad_v_sol(i,j,k) = IniVal
# if defined FORCING_SV || defined HESSIAN_FSV
Expand Down
2 changes: 2 additions & 0 deletions ROMS/Nonlinear/post_initial.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@ MODULE post_initial_mod
# endif
!
USE ini_fields_mod, ONLY : ini_fields, ini_zeta
# ifdef SOLVE3D
USE set_depth_mod, ONLY : set_depth
# endif
!
implicit none
!
Expand Down
Loading