Skip to content

MOM6 code cleanup #763

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
adcroft merged 15 commits into from
May 7, 2018
Merged

MOM6 code cleanup #763

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
76a6778
Replaced 'if(' with 'if ('
Hallberg-NOAA May 5, 2018
562acf0
Replaced '.ge.' with '>='
Hallberg-NOAA May 5, 2018
f02deae
Replaced '.eq.' with '==' and '.ne.' with '/='
Hallberg-NOAA May 5, 2018
5e33043
Added dOxyGen comments in ALE regridding code
Hallberg-NOAA May 6, 2018
0de48ec
Stacked common-extent loops in MOM_ALE
Hallberg-NOAA May 6, 2018
a9605fb
Shortened long variable names in MOM_remapping.F90
Hallberg-NOAA May 6, 2018
380574a
Added dOxyGen comments in coord_ code
Hallberg-NOAA May 6, 2018
b224da4
Removed spaces between subroutine and arguments
Hallberg-NOAA May 6, 2018
233f76c
Removed space between arrays and indices in MOM_ice_shelf
Hallberg-NOAA May 6, 2018
30c1b26
Eliminated trailing semicolons from MOM6 code
Hallberg-NOAA May 6, 2018
4e9317f
dOxyGenized MOM_debugging.F90
Hallberg-NOAA May 7, 2018
bef564f
dOxyGenized MOM_checksums.F90
Hallberg-NOAA May 7, 2018
c64fc57
dOxyGenized MOM_safe_alloc.F90
Hallberg-NOAA May 7, 2018
5cb839e
dOxyGenized MOM_file_parser.F90
Hallberg-NOAA May 7, 2018
4adbbe3
Merge branch 'dev/gfdl' into code_cleanup
Hallberg-NOAA May 7, 2018
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
4 changes: 2 additions & 2 deletions config_src/coupled_driver/MOM_surface_forcing.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ subroutine convert_IOB_to_fluxes(IOB, fluxes, index_bounds, Time, G, CS, &
open_ocn_mask(:,:) = 1.0
if (CS%mask_srestore_under_ice) then ! Do not restore under sea-ice
do j=js,je ; do i=is,ie
if (sfc_state%SST(i,j) .le. -0.0539*sfc_state%SSS(i,j)) open_ocn_mask(i,j)=0.0
if (sfc_state%SST(i,j) <= -0.0539*sfc_state%SSS(i,j)) open_ocn_mask(i,j)=0.0
enddo; enddo
endif
if (CS%salt_restore_as_sflux) then
Expand Down Expand Up @@ -1009,7 +1009,7 @@ subroutine surface_forcing_init(Time, G, param_file, diag, CS, restore_salt, res

CS%diag => diag

call write_version_number (version)
call write_version_number(version)
! Read all relevant parameters and write them to the model log.
call log_version(param_file, mdl, version, "")

Expand Down
2 changes: 1 addition & 1 deletion config_src/coupled_driver/ocean_model_MOM.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -818,7 +818,7 @@ subroutine initialize_ocean_public_type(input_domain, Ocean_sfc, diag, maskmap,

call mpp_get_layout(input_domain,layout)
call mpp_get_global_domain(input_domain, xsize=xsz, ysize=ysz)
if(PRESENT(maskmap)) then
if (PRESENT(maskmap)) then
call mpp_define_domains((/1,xsz,1,ysz/),layout,Ocean_sfc%Domain, maskmap=maskmap)
else
call mpp_define_domains((/1,xsz,1,ysz/),layout,Ocean_sfc%Domain)
Expand Down
2 changes: 1 addition & 1 deletion config_src/solo_driver/MOM_driver.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ program MOM_main
! simulation does not exceed its CPU time limit. nmax is determined by
! evaluating the CPU time used between successive calls to write_cputime.
! Initially it is set to be very large.
integer :: nmax=2000000000;
integer :: nmax=2000000000

! A structure containing several relevant directory paths.
type(directories) :: dirs
Expand Down
26 changes: 13 additions & 13 deletions config_src/solo_driver/Neverland_surface_forcing.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,23 +73,23 @@ subroutine Neverland_wind_forcing(sfc_state, forces, day, G, CS)

! The i-loop extends to is-1 so that taux can be used later in the
! calculation of ustar - otherwise the lower bound would be Isq.
PI = 4.0*atan(1.0)
forces%taux(:,:) = 0.0
tau_max = 0.2
off = 0.02
PI = 4.0*atan(1.0)
forces%taux(:,:) = 0.0
tau_max = 0.2
off = 0.02
do j=js,je ; do I=is-1,Ieq
! x=(G%geoLonT(i,j)-G%west_lon)/G%len_lon
y=(G%geoLatT(i,j)-G%south_lat)/G%len_lat
! forces%taux(I,j) = G%mask2dCu(I,j) * 0.0
! x = (G%geoLonT(i,j)-G%west_lon)/G%len_lon
y = (G%geoLatT(i,j)-G%south_lat)/G%len_lat
! forces%taux(I,j) = G%mask2dCu(I,j) * 0.0

if (y.le.0.29) then
forces%taux(I,j) = forces%taux(I,j) + tau_max * ( (1/0.29)*y - ( 1/(2*PI) )*sin( (2*PI*y) / 0.29 ) )
if (y <= 0.29) then
forces%taux(I,j) = forces%taux(I,j) + tau_max * ( (1/0.29)*y - ( 1/(2*PI) )*sin( (2*PI*y) / 0.29 ) )
endif
if (y.gt.0.29 .and. y.le.(0.8-off)) then
forces%taux(I,j) = forces%taux(I,j) + tau_max *(0.35+0.65*cos(PI*(y-0.29)/(0.51-off)) )
if ((y > 0.29) .and. (y <= (0.8-off))) then
forces%taux(I,j) = forces%taux(I,j) + tau_max *(0.35+0.65*cos(PI*(y-0.29)/(0.51-off)) )
endif
if (y.gt.(0.8-off) .and. y.le.(1-off) ) then
forces%taux(I,j) = forces%taux(I,j) + tau_max *( 1.5*( (y-1+off) - (0.1/PI)*sin(10.0*PI*(y-0.8+off)) ) )
if ((y > (0.8-off)) .and. (y <= (1-off))) then
forces%taux(I,j) = forces%taux(I,j) + tau_max *( 1.5*( (y-1+off) - (0.1/PI)*sin(10.0*PI*(y-0.8+off)) ) )
endif
enddo ; enddo

Expand Down
12 changes: 6 additions & 6 deletions config_src/solo_driver/coupler_types.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ subroutine coupler_type_copy_1d_2d(var_in, var_out, is, ie, js, je, &
if (var_in%num_bcs >= 0) &
call CT_spawn_1d_2d(var_in, var_out, (/ is, is, ie, ie /), (/ js, js, je, je /), suffix)

if ((var_out%num_bcs > 0) .and. (diag_name .ne. ' ')) &
if ((var_out%num_bcs > 0) .and. (diag_name /= ' ')) &
call CT_set_diags_2d(var_out, diag_name, axes, time)

end subroutine coupler_type_copy_1d_2d
Expand Down Expand Up @@ -365,7 +365,7 @@ subroutine coupler_type_copy_1d_3d(var_in, var_out, is, ie, js, je, kd, &
if (var_in%num_bcs >= 0) &
call CT_spawn_1d_3d(var_in, var_out, (/ is, is, ie, ie /), (/ js, js, je, je /), (/1, kd/), suffix)

if ((var_out%num_bcs > 0) .and. (diag_name .ne. ' ')) &
if ((var_out%num_bcs > 0) .and. (diag_name /= ' ')) &
call CT_set_diags_3d(var_out, diag_name, axes, time)

end subroutine coupler_type_copy_1d_3d
Expand Down Expand Up @@ -408,7 +408,7 @@ subroutine coupler_type_copy_2d_2d(var_in, var_out, is, ie, js, je, &
if (var_in%num_bcs >= 0) &
call CT_spawn_2d_2d(var_in, var_out, (/ is, is, ie, ie /), (/ js, js, je, je /), suffix)

if ((var_out%num_bcs > 0) .and. (diag_name .ne. ' ')) &
if ((var_out%num_bcs > 0) .and. (diag_name /= ' ')) &
call CT_set_diags_2d(var_out, diag_name, axes, time)

end subroutine coupler_type_copy_2d_2d
Expand Down Expand Up @@ -459,7 +459,7 @@ subroutine coupler_type_copy_2d_3d(var_in, var_out, is, ie, js, je, kd, &
if (var_in%num_bcs >= 0) &
call CT_spawn_2d_3d(var_in, var_out, (/ is, is, ie, ie /), (/ js, js, je, je /), (/1, kd/), suffix)

if ((var_out%num_bcs > 0) .and. (diag_name .ne. ' ')) &
if ((var_out%num_bcs > 0) .and. (diag_name /= ' ')) &
call CT_set_diags_3d(var_out, diag_name, axes, time)

end subroutine coupler_type_copy_2d_3d
Expand Down Expand Up @@ -502,7 +502,7 @@ subroutine coupler_type_copy_3d_2d(var_in, var_out, is, ie, js, je, &
if (var_in%num_bcs >= 0) &
call CT_spawn_3d_2d(var_in, var_out, (/ is, is, ie, ie /), (/ js, js, je, je /), suffix)

if ((var_out%num_bcs > 0) .and. (diag_name .ne. ' ')) &
if ((var_out%num_bcs > 0) .and. (diag_name /= ' ')) &
call CT_set_diags_2d(var_out, diag_name, axes, time)

end subroutine coupler_type_copy_3d_2d
Expand Down Expand Up @@ -553,7 +553,7 @@ subroutine coupler_type_copy_3d_3d(var_in, var_out, is, ie, js, je, kd, &
if (var_in%num_bcs >= 0) &
call CT_spawn_3d_3d(var_in, var_out, (/ is, is, ie, ie /), (/ js, js, je, je /), (/1, kd/), suffix)

if ((var_out%num_bcs > 0) .and. (diag_name .ne. ' ')) &
if ((var_out%num_bcs > 0) .and. (diag_name /= ' ')) &
call CT_set_diags_3d(var_out, diag_name, axes, time)

end subroutine coupler_type_copy_3d_3d
Expand Down
Loading