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.

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

Fix crash issue when compiling with Openmp in repro mode #2

Merged
merged 1 commit into from
Feb 21, 2014

Conversation

Zhi-Liang
Copy link
Contributor

No description provided.

@adcroft
Copy link
Collaborator

adcroft commented Feb 21, 2014

I tried this branch and all tests with all compilers passed. Will merge from command line...

For the record, I checked that the code is actually invoked. It is used in DOME, global, global_ALE, nonBous_global, and all the SIS, SIS2 and coupled tests.

adcroft added a commit that referenced this pull request Feb 21, 2014
Fix crash issue when compiling with Openmp in repro mode
@adcroft adcroft merged commit 315465a into dev/master Feb 21, 2014
adcroft pushed a commit that referenced this pull request Apr 21, 2017
nikizadehgfdl referenced this pull request in nikizadehgfdl/MOM6 Oct 9, 2017
- Corrects environment and imports needed for MIDAS.
- Fixes EKE script.
- Fixes #2.
nikizadehgfdl referenced this pull request in nikizadehgfdl/MOM6 Oct 9, 2017
- Brings in a major refactor of open boundary code from branch
  user/ksh/open_bc on the ESMG fork.
- Updates MOM_parameter_doc files.
- No answer changes.

- NOAA-GFDL/MOM6@c2799bc Merge branch 'ESMG-user/ksh/open_bc' into dev/master
- NOAA-GFDL/MOM6@be8080a Added description for log_version in MOM_open_boundary
- NOAA-GFDL/MOM6@cff9f0e Fixed uninitialized logical in MOM_continuity_PPM
- NOAA-GFDL/MOM6@d4fe7f7 Merge branch 'user/ksh/open_bc' of https://github.com/ESMG/MOM6 into ESMG-user/ksh/open_bc
- NOAA-GFDL/MOM6@fd8cf8a Merge branch 'gustavo-marques-ICE_SHELF' into dev/master
- NOAA-GFDL/MOM6@299bdab Merge branch 'user/mjh/dye_tracers_restart_fix' into dev/master
- NOAA-GFDL/MOM6@30bc60b Chaged allocation of water/heat fluxes
- NOAA-GFDL/MOM6@da43065 Merge branch 'dev/master' into ICE_SHELF
- NOAA-GFDL/MOM6@12b8cc5 Put back OBC_SIMPLE tests.
- NOAA-GFDL/MOM6@ca7313e Merge branch 'dev/master' into user/ksh/open_bc
- NOAA-GFDL/MOM6@ad3219b Merge branch 'dev/master' of github.com:NOAA-GFDL/MOM6 into dev/master
- NOAA-GFDL/MOM6@8cb5593 Changed do_i test for Flather OBC
- NOAA-GFDL/MOM6@1bd381b Allocated fluxes%buoy in MOM_ice_shelf
- NOAA-GFDL/MOM6@6ee04ef Backing out unstable change to OBC
- NOAA-GFDL/MOM6@fbc1297 Merge branch 'dev/master' into user/ksh/open_bc
- NOAA-GFDL/MOM6@7ee3e4d Merge branch 'dev/master' of github.com:NOAA-GFDL/MOM6 into dev/master
- NOAA-GFDL/MOM6@0c103bb Merge branch 'user/ksh/open_bc' into user/ksh/open_bc_uv
- NOAA-GFDL/MOM6@3fa6245  Fix for cases without OBC
- NOAA-GFDL/MOM6@5edb9c9 Merge of dev/master
- NOAA-GFDL/MOM6@080e159 Merge branch 'dev/master' into user/ksh/open_bc
- NOAA-GFDL/MOM6@c4ff34d Merge branch 'dev/master' of github.com:NOAA-GFDL/MOM6 into dev/master
- NOAA-GFDL/MOM6@0cf8497 CCS1 runs with six cores.
- NOAA-GFDL/MOM6@bd59a04 Don't deallocate OBC on pes without boundary
- NOAA-GFDL/MOM6@ffb4aea  Fix OBC after merge.
- NOAA-GFDL/MOM6@9862707 Update to ISOMIP_tracer for OBC
- NOAA-GFDL/MOM6@2861388 Merge branch 'dev/master' into user/ksh/open_bc
- NOAA-GFDL/MOM6@f9613a8 Merge branch 'dev/master' of github.com:NOAA-GFDL/MOM6 into dev/master
- NOAA-GFDL/MOM6@5f222f0 Added OBC for flow parallel to boundary.
- NOAA-GFDL/MOM6@8e10ec5 Merge pull request mom-ocean#8 from adcroft/user/aja/obc_split_kind_and_direction
- NOAA-GFDL/MOM6@f182829 Unified deallocation of OBC on PE without OBs
- NOAA-GFDL/MOM6@c3c1106 Split OBC_kind_u into OBC_kind_u and OBC_direction_u
- NOAA-GFDL/MOM6@983ce84 Adjust OBC mask to be consistent with land mask.
- NOAA-GFDL/MOM6@c421b4b ISOMIP_tracer fix for OBC reorg.
- NOAA-GFDL/MOM6@ada7e63 Merge branch 'dev/master' into user/ksh/open_bc
- NOAA-GFDL/MOM6@75a8557 Merge branch 'dev/master' of github.com:NOAA-GFDL/MOM6 into dev/master
- NOAA-GFDL/MOM6@f1795fc Merge branch 'dev/master' into user/ksh/open_bc
- NOAA-GFDL/MOM6@97f0ecc Merge branch 'dev/master' of github.com:ESMG/MOM6 into dev/master
- NOAA-GFDL/MOM6@3119c76 Merge branch 'dev/master' of github.com:NOAA-GFDL/MOM6 into dev/master
- NOAA-GFDL/MOM6@be8e34d Merge branch 'dev/master' of https://github.com/NOAA-GFDL/MOM6 into dev/master
- NOAA-GFDL/MOM6@ae0a293 Merge branch 'dev/master' of github.com:ESMG/MOM6 into dev/master
- NOAA-GFDL/MOM6@4f4952d Merge pull request #2 from adcroft/user/aja/obc_refactor
- NOAA-GFDL/MOM6@5e86623 Merge from aja/obc_refactor
- NOAA-GFDL/MOM6@ee365bd Loop bound fix in set_Flather_Bdry_data()
- NOAA-GFDL/MOM6@4f5a51f Merge branch 'ESMG-user/ksh/open_bc' into user/aja/obc_refactor
- NOAA-GFDL/MOM6@2558954 Moved call to open_boundary_init from MOM to MOM_state_initialize
- NOAA-GFDL/MOM6@2074943  License line and loop bounds fix.
- NOAA-GFDL/MOM6@643063c Added license line to MOM_open_boundary.F90
- NOAA-GFDL/MOM6@0b8dc7b New function open_boundary_impose_normal_slope()
- NOAA-GFDL/MOM6@c6d6b76 Merge branch 'user/ksh/open_bc' of github.com:ESMG/MOM6 into dev/master
- NOAA-GFDL/MOM6@ead182e Merge pull request #1 from adcroft/user/aja/move_obctype_to_open_boundary_module
- NOAA-GFDL/MOM6@0248eb2 Separated set_Flather_... into fixed and state parts
- NOAA-GFDL/MOM6@59c5676 Moved set_Flather_Bdry_Conds() into MOM_open_boundary
- NOAA-GFDL/MOM6@c90bec4 Moved allocation of OBC type to MOM_open_boundary
- NOAA-GFDL/MOM6@d5efae2 Moved calls that set OBC masks into MOM_fixed_initialization
- NOAA-GFDL/MOM6@2d3856f Split out OBC positions in USER_initialization
- NOAA-GFDL/MOM6@83e50eb Split out DOME OBC positions
- NOAA-GFDL/MOM6@89b858f Re-ordered s/r in MOM_open_boundary.F90
- NOAA-GFDL/MOM6@98c4918 Moved calls to open_boundary_init() from MOM_dynamics_* to MOM.F90
- NOAA-GFDL/MOM6@ec8ba6f Moved open_boundary_CS parameters into ocean_OBC_type
- NOAA-GFDL/MOM6@2db5e11 Doxygenized MOM_open_boundary.F90
- NOAA-GFDL/MOM6@0a42b83 Moved ocean_OBC_type from MOM_variables to MOM_open_boundary
- NOAA-GFDL/MOM6@5baded0  Fix dye tracer restarts
- NOAA-GFDL/MOM6@b0dfd01 Merge branch 'dev/master' of github.com:ESMG/MOM6 into dev/master
- NOAA-GFDL/MOM6@6a61e89 Merge branch 'dev/master' of github.com:ESMG/MOM6 into dev/master
- NOAA-GFDL/MOM6@8cc50a1 Merge branch 'dev/master' of github.com:ESMG/MOM6 into dev/master
- NOAA-GFDL/MOM6@4d5d490 Merge branch 'dev/master' of github.com:ESMG/MOM6 into dev/master
- NOAA-GFDL/MOM6@f6ca193 Merge remote-tracking branch 'gfdl/dev/master' into dev/master
nikizadehgfdl referenced this pull request in nikizadehgfdl/MOM6 Oct 9, 2017
Merged from NOAA-GFDL/MOM6-examples
nikizadehgfdl referenced this pull request in nikizadehgfdl/MOM6 Oct 9, 2017
- Answers for global_ALE/hycom changed by commit NOAA-GFDL/MOM6@4ab620f

- NOAA-GFDL/MOM6@7ccae06 Merge pull request #2 from adcroft/new_remapping_algorithm
- NOAA-GFDL/MOM6@6008aa5 Fixed an uninitialized diagnostic id
- NOAA-GFDL/MOM6@a567dbf Bugfix for uninitialized variable in remap_via_sub_cells()
- NOAA-GFDL/MOM6@4ab620f *Switched remap_via_sub_cells() to use "new" algorithm
nikizadehgfdl referenced this pull request in nikizadehgfdl/MOM6 Oct 9, 2017
- NOAA-GFDL/MOM6@ae22a0f Merge pull request mom-ocean#578 from NCAR/dev/ncar
- NOAA-GFDL/MOM6@f4f882f Merge pull request mom-ocean#23 from gustavo-marques/combine_mct_modules
- NOAA-GFDL/MOM6@a85b728 Merge MCT modules
- NOAA-GFDL/MOM6@ba5b5ba Merge pull request mom-ocean#22 from gustavo-marques/check_fluxes
- NOAA-GFDL/MOM6@f5a8483 Adds option to write restart files
- NOAA-GFDL/MOM6@8745b4b Fills additional IOB fluxes
- NOAA-GFDL/MOM6@f6b22ff Merge branch 'dev/ncar' into check_fluxes
- NOAA-GFDL/MOM6@369d5d6 Merge pull request mom-ocean#21 from alperaltuntas/dev/ncar
- NOAA-GFDL/MOM6@2582e0a Adds run paramaters to control SW decomposition
- NOAA-GFDL/MOM6@58f78b9 Fill IOB, some fluxes still need to be checked
- NOAA-GFDL/MOM6@06a30ab Fixed clock and timing
- NOAA-GFDL/MOM6@1bca79b Merge pull request mom-ocean#20 from gustavo-marques/fix_merge
- NOAA-GFDL/MOM6@fb89b08 Adds code that got lost during merge
- NOAA-GFDL/MOM6@7480492 Merge pull request mom-ocean#19 from gustavo-marques/new_merge
- NOAA-GFDL/MOM6@be1e6cf Merge branch 'dev/master' into dev/ncar
- NOAA-GFDL/MOM6@76565cb Merge pull request mom-ocean#17 from gustavo-marques/fix_ssh_slopes
- NOAA-GFDL/MOM6@c04f081 Fix ssh slope calculation
- NOAA-GFDL/MOM6@17d4586 Merge pull request mom-ocean#16 from adcroft/ncar-cherry-picked-fixes
- NOAA-GFDL/MOM6@be46fee (*)Fixes gprime(1) when no layer coordinates are set
- NOAA-GFDL/MOM6@fccb7ae Avoids a SEGV when OBC are not in use with bi-harmonic friction
- NOAA-GFDL/MOM6@f42c970 Merge pull request mom-ocean#15 from gustavo-marques/small_fixes
- NOAA-GFDL/MOM6@31787c2 Adds reference to set_time that was lost during a conflict handling
- NOAA-GFDL/MOM6@d77936e Fix intent(inout) in ice_ocean_boundary
- NOAA-GFDL/MOM6@b403edd Merge pull request mom-ocean#14 from gustavo-marques/docs
- NOAA-GFDL/MOM6@4d346ca Merge branch 'dev/ncar' into docs
- NOAA-GFDL/MOM6@f7c26a5 Clean the module and start doxygenizing it
- NOAA-GFDL/MOM6@cd58e2a Merge pull request mom-ocean#13 from alperaltuntas/dev/ncar
- NOAA-GFDL/MOM6@37a53bc reorganize file structure
- NOAA-GFDL/MOM6@e6c5ddd Merge pull request mom-ocean#12 from gustavo-marques/fill_ice_ocean_bnd
- NOAA-GFDL/MOM6@6b6289a Remove trailing whitespace
- NOAA-GFDL/MOM6@7ce40e5 Fix undefined reference to fill_ice_ocean_bnd
- NOAA-GFDL/MOM6@d517719 Merge branch 'dev/ncar' into fill_ice_ocean_bnd
- NOAA-GFDL/MOM6@b69ab33 Filling ice_ocean_bnd - Draft
- NOAA-GFDL/MOM6@a306c90 Merge pull request mom-ocean#11 from adcroft/use-ocn-public-for-surface
- NOAA-GFDL/MOM6@c83e238 Correct indexing when using ocean_public_type
- NOAA-GFDL/MOM6@1f39c84 Replaces use of "surface" with "ocean_public_type"
- NOAA-GFDL/MOM6@5cd8d7a Filling ice_ocean_bnd, still needs work
- NOAA-GFDL/MOM6@3ceef26 Merge pull request mom-ocean#10 from adcroft/sketch-out-mct-run
- NOAA-GFDL/MOM6@714e8d6 Adds placeholders for stepping foward MOM
- NOAA-GFDL/MOM6@7f2207c Merge pull request #7 from adcroft/fix-mct-whitespace
- NOAA-GFDL/MOM6@a1db77f Cleans up white space
- NOAA-GFDL/MOM6@5700d67 Merge pull request #6 from adcroft/add-use-only-for-imports
- NOAA-GFDL/MOM6@beac3ed Adds "only" for all use statements
- NOAA-GFDL/MOM6@231d19e Merge pull request #5 from alperaltuntas/dev/ncar
- NOAA-GFDL/MOM6@3a923a2 Got initialization working
- NOAA-GFDL/MOM6@8b38141 Wrapped global data
- NOAA-GFDL/MOM6@970f848 added debugging
- NOAA-GFDL/MOM6@2540ed8 Filled empty subroutines in ocn_comp_mct.F90
- NOAA-GFDL/MOM6@ed3ed30 Added ocn_import_export module
- NOAA-GFDL/MOM6@aba7dc2 Completed ocn_init_mct
- NOAA-GFDL/MOM6@5df3bc3 Added method to point ponters to members of ocean_state_type
- NOAA-GFDL/MOM6@57e6086 Added methods to return domain/grid shape
- NOAA-GFDL/MOM6@37e7356 Added ocn_import_export.F90
- NOAA-GFDL/MOM6@2b794da Merge pull request #4 from alperaltuntas/dev/ncar
- NOAA-GFDL/MOM6@fbd405b Added coupler indices module
- NOAA-GFDL/MOM6@fa86163 Merge pull request #3 from NCAR/dev/gfdl
- NOAA-GFDL/MOM6@e8f2999 Merge pull request #2 from gustavo-marques/temp_salt_z_init_file
- NOAA-GFDL/MOM6@86936ba Adds option to read initial temp and salt from separate files
- NOAA-GFDL/MOM6@54f7976 Most initialization working
- NOAA-GFDL/MOM6@426357c Time and calendar initialization in ocn_comp_mct.F90
- NOAA-GFDL/MOM6@346097d Moved blank ocn_comp_mct.F90
- NOAA-GFDL/MOM6@405fecb Merge pull request #1 from gustavo-marques/ice_shelf
- NOAA-GFDL/MOM6@711a613 Removes frazil's contribution to evaporation
nikizadehgfdl referenced this pull request in nikizadehgfdl/MOM6 Oct 9, 2017
- Updates MOM_parameter_doc files.

- NOAA-GFDL/MOM6@cde6d3f Merge branch 'dev/master' into dev/gfdl
- NOAA-GFDL/MOM6@ae22a0f Merge pull request mom-ocean#578 from NCAR/dev/ncar
- NOAA-GFDL/MOM6@f4f882f Merge pull request mom-ocean#23 from gustavo-marques/combine_mct_modules
- NOAA-GFDL/MOM6@a85b728 Merge MCT modules
- NOAA-GFDL/MOM6@ba5b5ba Merge pull request mom-ocean#22 from gustavo-marques/check_fluxes
- NOAA-GFDL/MOM6@f5a8483 Adds option to write restart files
- NOAA-GFDL/MOM6@8745b4b Fills additional IOB fluxes
- NOAA-GFDL/MOM6@f6b22ff Merge branch 'dev/ncar' into check_fluxes
- NOAA-GFDL/MOM6@369d5d6 Merge pull request mom-ocean#21 from alperaltuntas/dev/ncar
- NOAA-GFDL/MOM6@2582e0a Adds run paramaters to control SW decomposition
- NOAA-GFDL/MOM6@58f78b9 Fill IOB, some fluxes still need to be checked
- NOAA-GFDL/MOM6@06a30ab Fixed clock and timing
- NOAA-GFDL/MOM6@1bca79b Merge pull request mom-ocean#20 from gustavo-marques/fix_merge
- NOAA-GFDL/MOM6@fb89b08 Adds code that got lost during merge
- NOAA-GFDL/MOM6@7480492 Merge pull request mom-ocean#19 from gustavo-marques/new_merge
- NOAA-GFDL/MOM6@be1e6cf Merge branch 'dev/master' into dev/ncar
- NOAA-GFDL/MOM6@76565cb Merge pull request mom-ocean#17 from gustavo-marques/fix_ssh_slopes
- NOAA-GFDL/MOM6@c04f081 Fix ssh slope calculation
- NOAA-GFDL/MOM6@17d4586 Merge pull request mom-ocean#16 from adcroft/ncar-cherry-picked-fixes
- NOAA-GFDL/MOM6@be46fee (*)Fixes gprime(1) when no layer coordinates are set
- NOAA-GFDL/MOM6@fccb7ae Avoids a SEGV when OBC are not in use with bi-harmonic friction
- NOAA-GFDL/MOM6@f42c970 Merge pull request mom-ocean#15 from gustavo-marques/small_fixes
- NOAA-GFDL/MOM6@31787c2 Adds reference to set_time that was lost during a conflict handling
- NOAA-GFDL/MOM6@d77936e Fix intent(inout) in ice_ocean_boundary
- NOAA-GFDL/MOM6@b403edd Merge pull request mom-ocean#14 from gustavo-marques/docs
- NOAA-GFDL/MOM6@4d346ca Merge branch 'dev/ncar' into docs
- NOAA-GFDL/MOM6@f7c26a5 Clean the module and start doxygenizing it
- NOAA-GFDL/MOM6@cd58e2a Merge pull request mom-ocean#13 from alperaltuntas/dev/ncar
- NOAA-GFDL/MOM6@37a53bc reorganize file structure
- NOAA-GFDL/MOM6@e6c5ddd Merge pull request mom-ocean#12 from gustavo-marques/fill_ice_ocean_bnd
- NOAA-GFDL/MOM6@6b6289a Remove trailing whitespace
- NOAA-GFDL/MOM6@7ce40e5 Fix undefined reference to fill_ice_ocean_bnd
- NOAA-GFDL/MOM6@d517719 Merge branch 'dev/ncar' into fill_ice_ocean_bnd
- NOAA-GFDL/MOM6@b69ab33 Filling ice_ocean_bnd - Draft
- NOAA-GFDL/MOM6@a306c90 Merge pull request mom-ocean#11 from adcroft/use-ocn-public-for-surface
- NOAA-GFDL/MOM6@c83e238 Correct indexing when using ocean_public_type
- NOAA-GFDL/MOM6@1f39c84 Replaces use of "surface" with "ocean_public_type"
- NOAA-GFDL/MOM6@5cd8d7a Filling ice_ocean_bnd, still needs work
- NOAA-GFDL/MOM6@3ceef26 Merge pull request mom-ocean#10 from adcroft/sketch-out-mct-run
- NOAA-GFDL/MOM6@714e8d6 Adds placeholders for stepping foward MOM
- NOAA-GFDL/MOM6@7f2207c Merge pull request #7 from adcroft/fix-mct-whitespace
- NOAA-GFDL/MOM6@a1db77f Cleans up white space
- NOAA-GFDL/MOM6@5700d67 Merge pull request #6 from adcroft/add-use-only-for-imports
- NOAA-GFDL/MOM6@beac3ed Adds "only" for all use statements
- NOAA-GFDL/MOM6@231d19e Merge pull request #5 from alperaltuntas/dev/ncar
- NOAA-GFDL/MOM6@3a923a2 Got initialization working
- NOAA-GFDL/MOM6@8b38141 Wrapped global data
- NOAA-GFDL/MOM6@970f848 added debugging
- NOAA-GFDL/MOM6@2540ed8 Filled empty subroutines in ocn_comp_mct.F90
- NOAA-GFDL/MOM6@ed3ed30 Added ocn_import_export module
- NOAA-GFDL/MOM6@aba7dc2 Completed ocn_init_mct
- NOAA-GFDL/MOM6@5df3bc3 Added method to point ponters to members of ocean_state_type
- NOAA-GFDL/MOM6@57e6086 Added methods to return domain/grid shape
- NOAA-GFDL/MOM6@37e7356 Added ocn_import_export.F90
- NOAA-GFDL/MOM6@2b794da Merge pull request #4 from alperaltuntas/dev/ncar
- NOAA-GFDL/MOM6@fbd405b Added coupler indices module
- NOAA-GFDL/MOM6@fa86163 Merge pull request #3 from NCAR/dev/gfdl
- NOAA-GFDL/MOM6@e8f2999 Merge pull request #2 from gustavo-marques/temp_salt_z_init_file
- NOAA-GFDL/MOM6@86936ba Adds option to read initial temp and salt from separate files
- NOAA-GFDL/MOM6@54f7976 Most initialization working
- NOAA-GFDL/MOM6@426357c Time and calendar initialization in ocn_comp_mct.F90
- NOAA-GFDL/MOM6@346097d Moved blank ocn_comp_mct.F90
- NOAA-GFDL/MOM6@405fecb Merge pull request #1 from gustavo-marques/ice_shelf
- NOAA-GFDL/MOM6@711a613 Removes frazil's contribution to evaporation
feiyulu referenced this pull request in feiyulu/MOM6 Apr 13, 2018
use ocean instead of global pes in MOM_oda_driver
adcroft pushed a commit that referenced this pull request Jul 6, 2018
adcroft pushed a commit that referenced this pull request Oct 5, 2018
Latest changes from MOM dev/gfdl
adcroft pushed a commit that referenced this pull request Nov 27, 2019
AndrewWittenberg pushed a commit to AndrewWittenberg/MOM6 that referenced this pull request Feb 6, 2020
…tore_temp_salt_coeffs

Optional use of differing restoring piston velocities for temp and salt
andrew-c-ross referenced this pull request in andrew-c-ross/MOM6 Jan 28, 2021
adcroft pushed a commit that referenced this pull request Mar 25, 2021
marshallward pushed a commit that referenced this pull request Sep 1, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants