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

Jump to bottom

Initialize more arrays below kmt #372

Merged
merged 6 commits into from
Mar 16, 2021
Merged

Initialize more arrays below kmt #372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
206077f
Initialize more arrays below kmt
mnlevy1981 Feb 25, 2021
478d9df
Update gfortran compile flags to trap uninit reals
mnlevy1981 Feb 25, 2021
ffd7733
Refactor setting terms to 0 into new routine
mnlevy1981 Mar 10, 2021
4c8dee7
Set used particle terms to 0 in ciso
mnlevy1981 Mar 10, 2021
d1a4771
initialize dzr_loc in ciso code
mnlevy1981 Mar 10, 2021
dd7cb41
Add -g -init=snan,arrays to ifort flags
mnlevy1981 Mar 16, 2021
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
6 changes: 5 additions & 1 deletion src/marbl_ciso_interior_tendency_mod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1074,6 +1074,7 @@ subroutine compute_particulate_terms(k, domain, tracer_local, marbl_tracer_indic
use marbl_settings_mod , only : caco3_bury_thres_iopt_fixed_depth
use marbl_settings_mod , only : caco3_bury_thres_depth
use marbl_settings_mod , only : caco3_bury_thres_omega_calc
use marbl_interior_tendency_share_mod, only : marbl_interior_tendency_share_set_used_particle_terms_to_zero

integer (int_kind), intent(in) :: k ! vertical model level
type(marbl_domain_type), intent(in) :: domain
Expand Down Expand Up @@ -1207,6 +1208,10 @@ subroutine compute_particulate_terms(k, domain, tracer_local, marbl_tracer_indic
((POC_ciso%sflux_in(k) - POC_ciso%sflux_out(k)) + &
(POC_ciso%hflux_in(k) - POC_ciso%hflux_out(k))) * dzr_loc

else ! k > column_kmt
call marbl_interior_tendency_share_set_used_particle_terms_to_zero(k, POC_ciso)
call marbl_interior_tendency_share_set_used_particle_terms_to_zero(k, P_CaCO3_ciso)
dzr_loc = c0
endif

!-----------------------------------------------------------------------
Expand Down Expand Up @@ -1276,7 +1281,6 @@ subroutine compute_particulate_terms(k, domain, tracer_local, marbl_tracer_indic
if (POC_ciso%to_floor > c0) then
POC_ciso%remin(k) = POC_ciso%remin(k) + ((POC_ciso%to_floor - POC_ciso%sed_loss(k)) * dzr_loc)
endif

endif

end associate
Expand Down
18 changes: 12 additions & 6 deletions src/marbl_interior_tendency_mod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2636,6 +2636,7 @@ subroutine compute_particulate_terms(k, domain, &
use marbl_glo_avg_mod, only : glo_avg_field_ind_interior_tendency_d_POP_bury_d_bury_coeff
use marbl_glo_avg_mod, only : glo_avg_field_ind_interior_tendency_d_bSi_bury_d_bury_coeff
use marbl_interior_tendency_share_mod, only : marbl_interior_tendency_share_export_particulate
use marbl_interior_tendency_share_mod, only : marbl_interior_tendency_share_set_used_particle_terms_to_zero

integer (int_kind) , intent(in) :: k ! vertical model level
type(marbl_domain_type) , intent(in) :: domain
Expand Down Expand Up @@ -2972,12 +2973,17 @@ subroutine compute_particulate_terms(k, domain, &

POP%hflux_out(k) = POP%hflux_in(k)

else

dzr_loc = c0 ! avoid 'dzr_loc' may be used uninitialized warning from gfortran
POC%remin(k) = c0
POC%sflux_out(k) = c0
POC%hflux_out(k) = c0
else ! k > column_kmt

call marbl_interior_tendency_share_set_used_particle_terms_to_zero(k, P_CaCO3)
call marbl_interior_tendency_share_set_used_particle_terms_to_zero(k, P_CaCO3_ALT_CO2)
call marbl_interior_tendency_share_set_used_particle_terms_to_zero(k, P_SiO2)
call marbl_interior_tendency_share_set_used_particle_terms_to_zero(k, dust)
call marbl_interior_tendency_share_set_used_particle_terms_to_zero(k, POC)
call marbl_interior_tendency_share_set_used_particle_terms_to_zero(k, P_iron)
call marbl_interior_tendency_share_set_used_particle_terms_to_zero(k, POP)
PON_remin = c0
dzr_loc = c0

endif

Expand Down
18 changes: 18 additions & 0 deletions src/marbl_interior_tendency_share_mod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@ module marbl_interior_tendency_share_mod

use marbl_kinds_mod, only : int_kind
use marbl_kinds_mod, only : r8
use marbl_constants_mod, only : c0
use marbl_settings_mod, only : ciso_on

implicit none
private

public :: marbl_interior_tendency_share_update_particle_flux_from_above
public :: marbl_interior_tendency_share_set_used_particle_terms_to_zero
public :: marbl_interior_tendency_share_export_variables
public :: marbl_interior_tendency_share_export_zooplankton
public :: marbl_interior_tendency_share_export_particulate
Expand All @@ -31,6 +33,21 @@ end subroutine marbl_interior_tendency_share_update_particle_flux_from_above

!***********************************************************************

subroutine marbl_interior_tendency_share_set_used_particle_terms_to_zero(k, sinking_particle)

use marbl_interface_private_types, only : column_sinking_particle_type

integer (int_kind), intent(in) :: k
type(column_sinking_particle_type), intent(inout) :: sinking_particle

sinking_particle%sflux_out(k) = c0
sinking_particle%hflux_out(k) = c0
sinking_particle%remin(k) = c0

end subroutine marbl_interior_tendency_share_set_used_particle_terms_to_zero

!***********************************************************************

subroutine marbl_interior_tendency_share_export_variables(&
km, &
marbl_tracer_indices, &
Expand Down Expand Up @@ -126,6 +143,7 @@ subroutine marbl_interior_tendency_share_export_particulate(k, POC, DECAY_Hard,
marbl_particulate_share%caco3_diss_fields(k) = caco3_diss
endif
end subroutine marbl_interior_tendency_share_export_particulate

!***********************************************************************

end module marbl_interior_tendency_share_mod
4 changes: 2 additions & 2 deletions tests/driver_src/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,11 +151,11 @@ all: gnu

.PHONY: gnu
gnu:
$(MAKE) -f $(MAKE_DIR)/Makefile $(EXE) COMP_NAME=gnu$(MPISUF) FC=gfortran FCFLAGS="-Wall -Wextra -Wno-compare-reals -Werror -O2 -ffree-form -cpp" INC="-J $(OBJ_ROOT)/gnu$(MPISUF)" INC2="-J $(OBJ_ROOT)/gnu$(MPISUF)/driver"
$(MAKE) -f $(MAKE_DIR)/Makefile $(EXE) COMP_NAME=gnu$(MPISUF) FC=gfortran FCFLAGS="-Wall -Wextra -Wno-compare-reals -Werror -O2 -ffree-form -cpp -finit-real=snan -ffpe-trap=invalid" INC="-J $(OBJ_ROOT)/gnu$(MPISUF)" INC2="-J $(OBJ_ROOT)/gnu$(MPISUF)/driver"

.PHONY: intel
intel:
$(MAKE) -f $(MAKE_DIR)/Makefile $(EXE) COMP_NAME=intel$(MPISUF) FC=ifort FCFLAGS="-O2 -free -cpp -nogen-interface -fp-model source" INC="-module $(OBJ_ROOT)/intel$(MPISUF)" INC2="-module $(OBJ_ROOT)/intel$(MPISUF)/driver"
$(MAKE) -f $(MAKE_DIR)/Makefile $(EXE) COMP_NAME=intel$(MPISUF) FC=ifort FCFLAGS="-g -O2 -init=snan,arrays -free -cpp -nogen-interface -fp-model source" INC="-module $(OBJ_ROOT)/intel$(MPISUF)" INC2="-module $(OBJ_ROOT)/intel$(MPISUF)/driver"

.PHONY: pgi
pgi:
Expand Down