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

Replace GOMP. Implement OpenMP in MOM_vert_friction.F90. Fix OpenMP erro... #4

Merged
merged 5 commits into from
Mar 8, 2014
Merged

Replace GOMP. Implement OpenMP in MOM_vert_friction.F90. Fix OpenMP erro... #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
df6e826
Replace GOMP. Implement OpenMP in MOM_vert_friction.F90. Fix OpenMP e…
Zhi-Liang Mar 5, 2014
e4a3be8
change nthreads to ocean_nthreads to be consistent with coupler_nml
Zhi-Liang Mar 5, 2014
e60632d
always to call check_nml_error
Zhi-Liang Mar 5, 2014
7687782
Solve the issue that could not reproduce old answer when compiling wi…
Zhi-Liang Mar 7, 2014
7f2b7f7
fix to solve reproducing ability from old results in experiment global
Zhi-Liang Mar 7, 2014
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 .doxygen
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1416,7 +1416,7 @@ FORMULA_TRANSPARENT = YES
# The default value is: NO.
# This tag requires that the tag GENERATE_HTML is set to YES.

USE_MATHJAX = NO
USE_MATHJAX = YES

# When MathJax is enabled you can set the default output format to be used for
# the MathJax output. See the MathJax site (see:
Expand Down
18 changes: 15 additions & 3 deletions config_src/solo_driver/MOM_driver.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ program MOM_main
type(time_type) :: energysavedays ! The interval between writing the energies
! and other integral quantities of the run.

integer :: ocean_nthreads = 1 ! Number of Openmp threads
integer :: date_init(6)=0 ! The start date of the whole simulation.
integer :: date(6)=-1 ! Possibly the start date of this run segment.
integer :: years=0, months=0, days=0 ! These may determine the segment run
Expand All @@ -166,12 +167,14 @@ program MOM_main
type(ice_shelf_CS), pointer :: ice_shelf_CSp => NULL()
!-----------------------------------------------------------------------

integer :: get_cpu_affinity, base_cpu, omp_get_num_threads, omp_get_thread_num

character(len=4), parameter :: vers_num = 'v2.0'
! This include declares and sets the variable "version".
#include "version_variable.h"
character(len=40) :: mod = "MOM_main (MOM_driver)" ! This module's name.

namelist /ocean_solo_nml/ date_init, calendar, months, days, hours, minutes, seconds
namelist /ocean_solo_nml/ date_init, calendar, months, days, hours, minutes, seconds, ocean_nthreads

!#######################################################################

Expand All @@ -193,10 +196,10 @@ program MOM_main
call open_file(unit, 'input.nml', form=ASCII_FILE, action=READONLY_FILE)
read(unit, ocean_solo_nml, iostat=io_status)
call close_file(unit)
if (years+months+days+hours+minutes+seconds > 0) then
! if (years+months+days+hours+minutes+seconds > 0) then
ierr = check_nml_error(io_status,'ocean_solo_nml')
if (is_root_pe()) write(*,ocean_solo_nml)
endif
! endif
endif

! Read ocean_solo restart, which can override settings from the namelist.
Expand All @@ -220,6 +223,15 @@ program MOM_main
endif
call set_calendar_type(calendar_type)

#ifndef NOT_SET_AFFINITY
!$ call omp_set_num_threads(ocean_nthreads)
!$ base_cpu = get_cpu_affinity()
!$OMP PARALLEL
!$ call set_cpu_affinity( base_cpu + omp_get_thread_num() )
!$OMP END PARALLEL
#endif


if (sum(date_init) > 0) then
Start_time = set_date(date_init(1),date_init(2), date_init(3), &
date_init(4),date_init(5),date_init(6))
Expand Down
2 changes: 1 addition & 1 deletion examples/.datasets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/lustre/fs/pdata/gfdl_O/datasets
/lustre/f1/pdata/gfdl_O/datasets
1 change: 1 addition & 0 deletions examples/coupled_AM2_LM3_SIS/AM2_MOM6i_1deg/INPUT/.datasets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../.datasets
1 change: 1 addition & 0 deletions examples/coupled_AM2_LM3_SIS/AM2_MOM6i_1deg/INPUT/BetaDistributionTable.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.datasets/CM2G63L/siena/INPUT/BetaDistributionTable.txt
1 change: 1 addition & 0 deletions examples/coupled_AM2_LM3_SIS/AM2_MOM6i_1deg/INPUT/README
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.datasets/CM2G63L/siena/mosaic.unpacked/README
1 change: 1 addition & 0 deletions examples/coupled_AM2_LM3_SIS/AM2_MOM6i_1deg/INPUT/README_atmos2004
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.datasets/CM2G63L/siena/INPUT/README_atmos2004
1 change: 1 addition & 0 deletions examples/coupled_AM2_LM3_SIS/AM2_MOM6i_1deg/INPUT/aerosol.optical.dat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.datasets/CM2G63L/siena/INPUT/aerosol.optical.dat
1 change: 1 addition & 0 deletions examples/coupled_AM2_LM3_SIS/AM2_MOM6i_1deg/INPUT/annual_mean_ozone
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.datasets/CM2G63L/siena/INPUT/annual_mean_ozone
1 change: 1 addition & 0 deletions examples/coupled_AM2_LM3_SIS/AM2_MOM6i_1deg/INPUT/ch4_gblannualdata
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.datasets/CM2G63L/siena/INPUT/ch4_gblannualdata
1 change: 1 addition & 0 deletions examples/coupled_AM2_LM3_SIS/AM2_MOM6i_1deg/INPUT/co2_gblannualdata
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.datasets/CM2G63L/siena/INPUT/co2_gblannualdata
1 change: 1 addition & 0 deletions examples/coupled_AM2_LM3_SIS/AM2_MOM6i_1deg/INPUT/coupler.res
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.datasets/CM2G63L/siena/RESTART/CM2G.initCond_2011.12.16.unpacked/coupler.res
1 change: 1 addition & 0 deletions examples/coupled_AM2_LM3_SIS/AM2_MOM6i_1deg/INPUT/cover_type_field
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.datasets/CM2G63L/siena/INPUT/cover_type_field
1 change: 1 addition & 0 deletions examples/coupled_AM2_LM3_SIS/AM2_MOM6i_1deg/INPUT/eftsw4str
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.datasets/CM2G63L/siena/INPUT/eftsw4str
1 change: 1 addition & 0 deletions examples/coupled_AM2_LM3_SIS/AM2_MOM6i_1deg/INPUT/esf_sw_input_data_n38b18
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.datasets/CM2G63L/siena/INPUT/esf_sw_input_data_n38b18
1 change: 1 addition & 0 deletions examples/coupled_AM2_LM3_SIS/AM2_MOM6i_1deg/INPUT/esf_sw_input_data_n72b25
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.datasets/CM2G63L/siena/INPUT/esf_sw_input_data_n72b25
1 change: 1 addition & 0 deletions examples/coupled_AM2_LM3_SIS/AM2_MOM6i_1deg/INPUT/f113_gblannualdata
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.datasets/CM2G63L/siena/INPUT/f113_gblannualdata
1 change: 1 addition & 0 deletions examples/coupled_AM2_LM3_SIS/AM2_MOM6i_1deg/INPUT/f11_gblannualdata
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.datasets/CM2G63L/siena/INPUT/f11_gblannualdata
1 change: 1 addition & 0 deletions examples/coupled_AM2_LM3_SIS/AM2_MOM6i_1deg/INPUT/f12_gblannualdata
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.datasets/CM2G63L/siena/INPUT/f12_gblannualdata
1 change: 1 addition & 0 deletions examples/coupled_AM2_LM3_SIS/AM2_MOM6i_1deg/INPUT/f22_gblannualdata
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.datasets/CM2G63L/siena/INPUT/f22_gblannualdata
1 change: 1 addition & 0 deletions examples/coupled_AM2_LM3_SIS/AM2_MOM6i_1deg/INPUT/ground_type_field
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.datasets/CM2G63L/siena/INPUT/ground_type_field
1 change: 1 addition & 0 deletions examples/coupled_AM2_LM3_SIS/AM2_MOM6i_1deg/INPUT/groundwater_residence_time_field
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.datasets/CM2G63L/siena/INPUT/groundwater_residence_time_field
1 change: 1 addition & 0 deletions examples/coupled_AM2_LM3_SIS/AM2_MOM6i_1deg/INPUT/h2o12001400_hi00_data
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.datasets/CM2G63L/siena/INPUT/h2o12001400_hi00_data
1 change: 1 addition & 0 deletions examples/coupled_AM2_LM3_SIS/AM2_MOM6i_1deg/INPUT/h2o12001400_hi92_data
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.datasets/CM2G63L/siena/INPUT/h2o12001400_hi92_data
1 change: 1 addition & 0 deletions examples/coupled_AM2_LM3_SIS/AM2_MOM6i_1deg/INPUT/h2ockd2.1_corrdata
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.datasets/CM2G63L/siena/INPUT/h2ockd2.1_corrdata
1 change: 1 addition & 0 deletions examples/coupled_AM2_LM3_SIS/AM2_MOM6i_1deg/INPUT/h2ockd2.1_data
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.datasets/CM2G63L/siena/INPUT/h2ockd2.1_data
1 change: 1 addition & 0 deletions examples/coupled_AM2_LM3_SIS/AM2_MOM6i_1deg/INPUT/h2ockd2.4_corrdata
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.datasets/CM2G63L/siena/INPUT/h2ockd2.4_corrdata
1 change: 1 addition & 0 deletions examples/coupled_AM2_LM3_SIS/AM2_MOM6i_1deg/INPUT/h2ocoeff_ckd_0_3000_10cm_hi00
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.datasets/CM2G63L/siena/INPUT/h2ocoeff_ckd_0_3000_10cm_hi00
1 change: 1 addition & 0 deletions examples/coupled_AM2_LM3_SIS/AM2_MOM6i_1deg/INPUT/h2ocoeff_ckd_speccombwidebds_hi00
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.datasets/CM2G63L/siena/INPUT/h2ocoeff_ckd_speccombwidebds_hi00
1 change: 1 addition & 0 deletions examples/coupled_AM2_LM3_SIS/AM2_MOM6i_1deg/INPUT/h2ocoeff_ckd_speccombwidebds_hi92
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.datasets/CM2G63L/siena/INPUT/h2ocoeff_ckd_speccombwidebds_hi92
1 change: 1 addition & 0 deletions examples/coupled_AM2_LM3_SIS/AM2_MOM6i_1deg/INPUT/h2ocoeff_rsb_0_3000_10cm_hi00
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.datasets/CM2G63L/siena/INPUT/h2ocoeff_rsb_0_3000_10cm_hi00
1 change: 1 addition & 0 deletions examples/coupled_AM2_LM3_SIS/AM2_MOM6i_1deg/INPUT/h2ocoeff_rsb_speccombwidebds_hi00
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.datasets/CM2G63L/siena/INPUT/h2ocoeff_rsb_speccombwidebds_hi00
1 change: 1 addition & 0 deletions examples/coupled_AM2_LM3_SIS/AM2_MOM6i_1deg/INPUT/h2ocoeff_rsb_speccombwidebds_hi92
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.datasets/CM2G63L/siena/INPUT/h2ocoeff_rsb_speccombwidebds_hi92
1 change: 1 addition & 0 deletions examples/coupled_AM2_LM3_SIS/AM2_MOM6i_1deg/INPUT/id1ch4n2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.datasets/CM2G63L/siena/INPUT/id1ch4n2
1 change: 1 addition & 0 deletions examples/coupled_AM2_LM3_SIS/AM2_MOM6i_1deg/INPUT/id1o3
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.datasets/CM2G63L/siena/INPUT/id1o3
1 change: 1 addition & 0 deletions examples/coupled_AM2_LM3_SIS/AM2_MOM6i_1deg/INPUT/id2h2obdckd2p1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.datasets/CM2G63L/siena/INPUT/id2h2obdckd2p1
1 change: 1 addition & 0 deletions examples/coupled_AM2_LM3_SIS/AM2_MOM6i_1deg/INPUT/id2h2obdfull
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.datasets/CM2G63L/siena/INPUT/id2h2obdfull
1 change: 1 addition & 0 deletions examples/coupled_AM2_LM3_SIS/AM2_MOM6i_1deg/INPUT/id2h2orbts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.datasets/CM2G63L/siena/INPUT/id2h2orbts
1 change: 1 addition & 0 deletions examples/coupled_AM2_LM3_SIS/AM2_MOM6i_1deg/INPUT/lean_solar_spectral_data.dat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.datasets/CM2G63L/siena/INPUT/lean_solar_spectral_data.dat
1 change: 1 addition & 0 deletions examples/coupled_AM2_LM3_SIS/AM2_MOM6i_1deg/INPUT/n2o_gblannualdata
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.datasets/CM2G63L/siena/INPUT/n2o_gblannualdata
1 change: 1 addition & 0 deletions examples/coupled_AM2_LM3_SIS/AM2_MOM6i_1deg/INPUT/o39001200_hi00_data
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.datasets/CM2G63L/siena/INPUT/o39001200_hi00_data
1 change: 1 addition & 0 deletions examples/coupled_AM2_LM3_SIS/AM2_MOM6i_1deg/INPUT/o39001200_hi92_data
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.datasets/CM2G63L/siena/INPUT/o39001200_hi92_data
1 change: 1 addition & 0 deletions examples/coupled_AM2_LM3_SIS/AM2_MOM6i_1deg/INPUT/radfn_5-2995_100-490k
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.datasets/CM2G63L/siena/INPUT/radfn_5-2995_100-490k
1 change: 1 addition & 0 deletions examples/coupled_AM2_LM3_SIS/AM2_MOM6i_1deg/INPUT/randelo3data
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.datasets/CM2G63L/siena/INPUT/randelo3data
1 change: 1 addition & 0 deletions examples/coupled_AM2_LM3_SIS/AM2_MOM6i_1deg/INPUT/river_destination_field
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.datasets/CM2G63L/siena/INPUT/river_destination_field
1 change: 1 addition & 0 deletions examples/coupled_AM2_LM3_SIS/AM2_MOM6i_1deg/INPUT/seasonal_ozone
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.datasets/CM2G63L/siena/INPUT/seasonal_ozone
1 change: 1 addition & 0 deletions examples/coupled_AM2_LM3_SIS/AM2_MOM6i_1deg/INPUT/stdlvls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.datasets/CM2G63L/siena/INPUT/stdlvls
1 change: 1 addition & 0 deletions examples/coupled_AM2_LM3_SIS/AM2_MOM6i_1deg/INPUT/swstratendramadata
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.datasets/CM2G63L/siena/INPUT/swstratendramadata
Loading