Skip to content

Small fixes for iceberg module, that allow compiling with intel debug flags #664

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
suvarchal merged 1 commit into from
Jan 12, 2025
Merged

Small fixes for iceberg module, that allow compiling with intel debug flags #664

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 17 additions & 0 deletions src/icb_allocate.F90
View file
Open in desktop
Copy link
Collaborator

@suvarchal suvarchal Jan 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not sure about this, shouldn't the subroutine be inside the module, and use this module when we use alllocate_icb. anyways module it is not being used anywhere in this PR. so is redundant.

Copy link
Collaborator

@suvarchal suvarchal Jan 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

but lets fix it another day and merge.

Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
module allocate_icb_interface
interface
subroutine allocate_icb(partit, mesh)
use iceberg_params
use g_config
use g_comm
use g_comm_auto
use o_param
use MOD_PARTIT
use MOD_MESH
implicit none
type(t_partit), intent(inout), target :: partit
type(t_mesh), intent(in) , target :: mesh
end subroutine allocate_icb
end interface
end module allocate_icb_interface

subroutine allocate_icb(partit, mesh)
use iceberg_params
use g_config
Expand Down
3 changes: 2 additions & 1 deletion src/icb_dyn.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
module iceberg_dynamics
USE MOD_MESH
use MOD_PARTIT
USE MOD_PARSUP
use MOD_ICE
USE MOD_DYN
use iceberg_params
Expand Down Expand Up @@ -1167,7 +1168,7 @@ subroutine iceberg_avvelo(mesh, partit, dynamics, uo_dz,vo_dz,depth_ib,iceberg_e

if(dz < 1) then
!write(*,*) 'z coord of up node', n_up, ':', coord_nod3D(3, n_up), 'z coord of low node', n_low, ':', coord_nod3D(3, n_low)
call par_ex
call par_ex (partit%MPI_COMM_FESOM, partit%mype)
Copy link
Collaborator

@suvarchal suvarchal Jan 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes this is what it should be.

stop
end if

Expand Down
5 changes: 3 additions & 2 deletions src/icb_elem.F90
View file
Open in desktop
Copy link
Collaborator

@suvarchal suvarchal Jan 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes yes

Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ module iceberg_element
use MOD_PARTIT
USE MOD_MESH
USE MOD_DYN
USE MOD_PARSUP
use iceberg_params
use iceberg_thermodynamics
use iceberg_ocean_coupling
Expand Down Expand Up @@ -262,12 +263,12 @@ subroutine FEM_eval_old(mesh, partit, u_at_ib,v_at_ib,lon,lat,field_u,field_v,el
if( (x > maxlon) .OR. (x < minlon) ) then
write(*,*) 'FEM_eval error: iceberg lon ', x, ' outside element!'
write(*,*) 'maxlon:', maxlon, ' minlon:', minlon
call par_ex
call par_ex (partit%MPI_COMM_FESOM, partit%mype)
stop
else if( (y > maxlat) .OR. (y < minlat)) then
write(*,*) 'FEM_eval error: iceberg lat', y, ' outside element!'
write(*,*) 'maxlat:', maxlat, ' minlat:', minlat
call par_ex
call par_ex (partit%MPI_COMM_FESOM, partit%mype)
stop
else
!everything okay
Expand Down
Loading
Loading