Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
120 commits
Select commit Hold shift + click to select a range
58e7197
+Update the coupler_type_reform_rwh branch of FMS
Hallberg-NOAA Aug 15, 2017
48c1bfe
Merge branch 'dev/gfdl' of github.com:NOAA-GFDL/MOM6-examples into de…
Hallberg-NOAA Aug 15, 2017
3871c25
Merge branch 'dev/gfdl' of github.com:NOAA-GFDL/MOM6-examples into de…
Hallberg-NOAA Aug 16, 2017
9e605be
Added month/annual min/max of mlotst to diag_table
adcroft Aug 24, 2017
7e45804
Merge branch 'dev/gfdl' of github.com:NOAA-GFDL/MOM6-examples into de…
Hallberg-NOAA Aug 25, 2017
3ec0ff1
MOM6: *Removed dependence of OBC solutions on external h
Hallberg-NOAA Aug 28, 2017
5cb23e3
MOM6: Reordered MOM6 initialization calls
Hallberg-NOAA Aug 30, 2017
380517d
MOM6: Merge branch 'Hallberg-NOAA-dev/gfdl' into dev/gfdl
adcroft Sep 6, 2017
59bdfa6
Merge branch 'Hallberg-NOAA-dev/gfdl' into dev/gfdl
adcroft Sep 6, 2017
595b4cd
Corrected version of FMS submodule
adcroft Sep 7, 2017
cefcb99
Merge branch 'reorder_MOM_init' of https://github.com/Hallberg-NOAA/M…
adcroft Sep 7, 2017
f5ebf29
Merge branch 'Hallberg-NOAA-reorder_MOM_init' into dev/gfdl
adcroft Sep 7, 2017
06ae1dd
SIS2: Merge branch 'Hallberg-NOAA-dev/gfdl' into dev/gfdl
adcroft Sep 8, 2017
b7a8b63
icebergs: Update license to LGPLv3
adcroft Sep 8, 2017
222ac50
MOM6: Merge pull request #585 from NOAA-GFDL/split_MOM_forcing_type
adcroft Sep 12, 2017
5ea0080
*Change barotropic solver used by CM2G63L
Hallberg-NOAA Sep 12, 2017
47f9e96
Cleaned up MOM_input for CM2G63L
adcroft Sep 13, 2017
b2b0964
Merge branch 'Hallberg-NOAA-modernize_CM2G63L' into dev/gfdl
adcroft Sep 13, 2017
3d01bfb
MOM6: +Obsoleted USE_LEGACY_SPLIT
Hallberg-NOAA Sep 13, 2017
44db22b
Updated parameter files for tracer-mixing
adcroft Sep 14, 2017
776b6e6
Switch to updated version of FMS for MOM6#586
MJHarrison-GFDL Sep 14, 2017
578e6f1
Reset SIS2 and FMS submodule versions
adcroft Sep 14, 2017
f6957cf
Merge branch 'obsolete_legacy_split' into dev/gfdl
adcroft Sep 14, 2017
0814494
Merge pull request #3 from NOAA-GFDL/dev/master
jkrasting Sep 14, 2017
c586afe
Merge branch 'user/mjh/FMS_for_sponges' of https://github.com/MJHarri…
adcroft Sep 14, 2017
beb1964
Merge branch 'MJHarrison-GFDL-user/mjh/FMS_for_sponges' into dev/gfdl
adcroft Sep 14, 2017
95d1e3c
OM4: Remove _pow2 variables from diag_table
adcroft Sep 18, 2017
ede50cc
MOM6:Merge pull request #594 from adcroft/cmor_missing_value
adcroft Sep 18, 2017
04c5e64
MOM6: Merge pull request #593 from adcroft/fix_cell_measures
adcroft Sep 18, 2017
ecc935b
MOM6: Merge pull request #595 from adcroft/add_static_cell_measures
adcroft Sep 18, 2017
b312c21
OM4: Cleanup MOM_input
adcroft Sep 18, 2017
aed7f0f
Fix for NCI Jenkins fail, MESO_025_23L
adcroft Sep 18, 2017
4af5297
Adds sftof to OM4 diag_table
adcroft Sep 19, 2017
47cb72e
Initial commit of CMIP6 offline diag script
jkrasting Sep 15, 2017
7173edb
MOC reported on interfaces, not levels
jkrasting Sep 20, 2017
4ef960e
MOM6: Merge pull request #601 from adcroft/fix_units_vhml_vhgm
adcroft Sep 22, 2017
9984e36
OM4: Adds monthly z-space transports
adcroft Sep 22, 2017
3327f1b
OM4: Clean up diag_table.MOM6_spinup
adcroft Sep 22, 2017
f38fcd1
OM4: Adds rho-space transports to diag_table
adcroft Sep 22, 2017
6618238
OM4: Moved boundary_forcing_heat_tendency to annual_z
adcroft Sep 22, 2017
1bc3e6e
OM4: Adds omldamax to ocean_daily!
adcroft Sep 22, 2017
474b575
OM4: Enables rho-space diagnostics
adcroft Sep 22, 2017
62bb9e6
MOM6: Merge pull request #607 from ashao/remapped_vert_remap_tendencies
adcroft Sep 22, 2017
b557cef
OM4_05: Enabled rho-space diagnostics
adcroft Sep 22, 2017
7b98a79
MOM6: Merge pull request #610 from adcroft/cmip-compatible-diagnostic…
adcroft Sep 25, 2017
0ad7ba9
*OM4: Recover CM4 2017.07.05 answers
adcroft Sep 25, 2017
e7028e0
OM4: (*)Cleanup MOM_input
adcroft Sep 25, 2017
1673fc7
*OM4_025: Updates baseline to final OM4.0 configuration
adcroft Sep 25, 2017
853bcbb
*OM4_05: Update baseline to candidate OM4.configuration
adcroft Sep 25, 2017
f63875d
MOM6: Merge branch 'ashao-fix_T_S_flux_diags' into dev/gfdl
adcroft Sep 26, 2017
4b4f8ef
MOM6: Merge pull request #612 from ESMG/OBC_tracers
adcroft Sep 26, 2017
5e48ccd
MOM6: Merge pull request #612 from ESMG/OBC_tracers
adcroft Sep 26, 2017
52d52e3
Consolidated refineDiag updates
jkrasting Sep 27, 2017
7f94c58
MOM6: Merge pull request #618 from adcroft/cell_measure_volcello
adcroft Sep 27, 2017
8d4de1e
MOM6: Merge pull request #621 from adcroft/adds_area_cell_method
adcroft Sep 27, 2017
da8591d
Include wmo as part of refine diags
Sep 28, 2017
a38e983
w had the wrong sign because divergence was calculated, not convergence
Sep 28, 2017
b979772
Merge pull request #4 from ashao/add_wmo_to_refine_diag
jkrasting Oct 1, 2017
b6a25d3
Merge pull request #5 from NOAA-GFDL/dev/gfdl
jkrasting Oct 1, 2017
769eb6b
refineDiag script uses basin_codes.nc file
jkrasting Oct 1, 2017
7f0ab79
Added hfbasin diagnostic to refineDiag script
jkrasting Oct 2, 2017
5d039f6
Adds a script to calculate transport in straits
Oct 3, 2017
2ab368b
Merge pull request #6 from ashao/add_mfo_diagnostic
jkrasting Oct 4, 2017
350462b
Updated coordinates in rho2 refineDiag script
jkrasting Oct 4, 2017
b235c77
Masked Indo-Pacific heat transport below 34S
jkrasting Oct 4, 2017
6ff7aac
Modified interface to calc_w_from_convergence()
jkrasting Oct 4, 2017
69f35ec
Updated calc_variance.py
jkrasting Oct 4, 2017
c7c3375
Updated diag table for transport diags
jkrasting Oct 4, 2017
839b026
Merge remote branch 'origin/post_9_27_updates' into basin_refinediag
jkrasting Oct 4, 2017
f4c5c95
Added thkcello/volcello for rho2 output
jkrasting Oct 4, 2017
ab64e2a
Various fixes for mfo (straits) diagnostic
jkrasting Oct 4, 2017
e8bd7e2
Merge remote branch 'origin/post_9_27_updates' into basin_refinediag
jkrasting Oct 4, 2017
29c2b13
Flexible mask tiling based on time dimension
jkrasting Oct 4, 2017
8fad2c9
Miscellaneous clean-ups from testing
jkrasting Oct 4, 2017
b1c65de
Updated umo in diag_table
jkrasting Oct 5, 2017
9d4536a
Updated cell_methods attrs. for refined diags
jkrasting Oct 5, 2017
1ebf336
Removed call to calc_varaince.py
jkrasting Oct 5, 2017
9647743
Added 'coordinates' attribute to basin/strait vars.
jkrasting Oct 5, 2017
bcd2b90
Tidy-up odds and ends after QC
jkrasting Oct 5, 2017
f15b916
Merge pull request #163 from jkrasting/basin_refinediag
adcroft Oct 5, 2017
78fadfa
Updated cmocean module import
jkrasting Oct 10, 2017
4cbea5b
Reorder indices of straits according to CMIP6/OMIP
Oct 11, 2017
96138c6
Merge pull request #182 from ashao/reorder_straits
StephenGriffies Oct 11, 2017
01f14a3
Reset exec permissions of python scripts
nikizadehgfdl Oct 12, 2017
c36036e
Added append_basin_mask.py script
jkrasting Oct 18, 2017
5e8de3e
Merge pull request #185 from jkrasting/ocean_static_script
adcroft Oct 18, 2017
d779aed
Merge pull request #183 from nikizadehgfdl/user/nikizadehgfdl/reset_e…
adcroft Oct 18, 2017
6f87aeb
icebergs: Merge pull request #57 from adcroft/berg_diffusion
adcroft Oct 19, 2017
5d867c1
MOM6: Merge branch 'MJHarrison-GFDL-SfcRestoringMask' into dev/gfdl
adcroft Oct 20, 2017
d9dd61d
MOM6: Merge branch 'MJHarrison-GFDL-HVisc_masking' into dev/gfdl
adcroft Oct 23, 2017
c95392e
Use only 2 cores for multi-core Travis-CI tests
adcroft Oct 24, 2017
60a055c
MOM6: Removed masking of areas in ocean_static.nc
adcroft Oct 25, 2017
21b3db3
Removed LT_Enhancement from diag_table
adcroft Nov 1, 2017
e57d90d
OM4: Turned off empty diagnostics in OM4_025
adcroft Nov 1, 2017
49795eb
MOM6: Two PRs for MOM6 to resolve diagnostics issues
adcroft Nov 1, 2017
5a724dc
More robust refineDiag scripts
jkrasting Nov 3, 2017
6a2f1fb
Merge pull request #187 from jkrasting/refinediag_fix_20171103
adcroft Nov 3, 2017
96a8e5f
Fixed typo in refineDiag_ocean_month_rho2.py
jkrasting Nov 3, 2017
f0c6afc
Merge pull request #188 from jkrasting/refinediag_fix_20171103
adcroft Nov 6, 2017
051a0ad
Merge pull request #181 from jkrasting/user/jpk/webapp_updates_20171010
adcroft Nov 6, 2017
fad8ff2
MOM6: +Corrected available_diags file frazil entries
Hallberg-NOAA Nov 9, 2017
1f1d57c
+Geometric progression for ENERGYSAVEDAYS
Hallberg-NOAA Nov 9, 2017
20b0aeb
+Added mean density and heat capacity diagnostics
Hallberg-NOAA Nov 10, 2017
22eb9a9
MOM6: +Made 4 commits to support barotropic tides
Hallberg-NOAA Nov 13, 2017
ac58394
MOM6: Made 4 commits to support barotropic tides
Hallberg-NOAA Nov 13, 2017
6b18621
Merge branch 'OM4-maintenance' into dev/gfdl
adcroft Nov 15, 2017
8c037c5
Merge branch 'tide_support' of https://github.com/Hallberg-NOAA/MOM6-…
adcroft Nov 15, 2017
d6edb4d
Transport analysis to work with monthly pp
jkrasting Nov 15, 2017
17d0228
Merge branch 'Hallberg-NOAA-tide_support' into dev/gfdl
adcroft Nov 15, 2017
36ee8e5
Merge pull request #191 from jkrasting/cmip6_analysis_updates
adcroft Nov 15, 2017
96b99d3
Merge branch 'OM4-maintenance' into dev/gfdl
adcroft Nov 15, 2017
539a74d
MOM6: Converted outside land masker to use tiles.
adcroft Nov 16, 2017
2bc46af
MOM6: Changes related to restructuring MOM.F90
Hallberg-NOAA Nov 16, 2017
9452ed2
Added ocean_only/tides_025 test case
Hallberg-NOAA Nov 17, 2017
edb0529
FMS: Updated to warsaw_201710
adcroft Nov 17, 2017
bbe3c65
Merge branch 'restructure_step_MOM' of https://github.com/Hallberg-NO…
adcroft Nov 17, 2017
12ff1c5
Merge branch 'Hallberg-NOAA-restructure_step_MOM' into dev/gfdl
adcroft Nov 17, 2017
c1cb38c
MOM6: Bringing up to date for purpose of dev/master PR
adcroft Nov 20, 2017
16b4b4f
Merge branch 'dev/master' into dev/gfdl
adcroft Nov 20, 2017
55838d6
mkmf: Fixes for symbolically linked files
adcroft Nov 20, 2017
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
412 changes: 195 additions & 217 deletions coupled_AM2_LM3_SIS/CM2G63L/MOM_input

Large diffs are not rendered by default.

255 changes: 131 additions & 124 deletions coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.all

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.layout
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ NJPROC = 6 !
! STATIC_MEMORY_ this is set in MOM_memory.h at compile time.
LAYOUT = 10, 6 !
! The processor layout that was acutally used.
IO_LAYOUT = 2, 2 ! default = 1
IO_LAYOUT = 1, 1 ! default = 1
! The processor layout to be used, or 0,0 to automatically
! set the io_layout to be the same as the layout.
NIBLOCK = 1 ! default = 1
Expand Down
85 changes: 18 additions & 67 deletions coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.short
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
! This file was written by the model and records the non-default parameters used at run-time.

! === module MOM ===
USE_LEGACY_SPLIT = True ! [Boolean] default = False
! If true, use the full range of options available from
! the older GOLD-derived split time stepping code.
THICKNESSDIFFUSE = True ! [Boolean] default = False
! If true, interface heights are diffused with a
! coefficient of KHTH.
Expand Down Expand Up @@ -68,25 +65,6 @@ NJGLOBAL = 210 !
NK = 63 ! [nondim]
! The number of model layers.

! === module MOM_tracer_registry ===

! === module MOM_EOS ===

! === module MOM_restart ===
PARALLEL_RESTARTFILES = True ! [Boolean] default = False
! If true, each processor writes its own restart file,
! otherwise a single restart file is generated

! === module MOM_tracer_flow_control ===
USE_IDEAL_AGE_TRACER = True ! [Boolean] default = False
! If true, use the ideal_age_example tracer package.
USE_OCMIP2_CFC = True ! [Boolean] default = False
! If true, use the MOM_OCMIP2_CFC tracer package.

! === module ideal_age_example ===

! === module MOM_OCMIP2_CFC ===

! === module MOM_fixed_initialization ===
INPUTDIR = "INPUT" ! default = "."
! The directory in which input files are found.
Expand Down Expand Up @@ -150,6 +128,22 @@ CHANNEL_CONFIG = "global_1deg" ! default = "none"
! file - Read open face widths everywhere from a
! NetCDF file on the model grid.

! === module MOM_tracer_registry ===

! === module MOM_EOS ===

! === module MOM_restart ===

! === module MOM_tracer_flow_control ===
USE_IDEAL_AGE_TRACER = True ! [Boolean] default = False
! If true, use the ideal_age_example tracer package.
USE_OCMIP2_CFC = True ! [Boolean] default = False
! If true, use the MOM_OCMIP2_CFC tracer package.

! === module ideal_age_example ===

! === module MOM_OCMIP2_CFC ===

! === module MOM_coord_initialization ===
COORD_CONFIG = "file" !
! This specifies how layers are to be defined:
Expand Down Expand Up @@ -268,17 +262,6 @@ KV_BBL_MIN = 0.0 ! [m2 s-1] default = 1.0E-04
! The minimum viscosities in the bottom boundary layer.
KV_TBL_MIN = 0.0 ! [m2 s-1] default = 1.0E-04
! The minimum viscosities in the top boundary layer.
FLUX_BT_COUPLING = True ! [Boolean] default = False
! If true, use mass fluxes to ensure consistency between
! the baroclinic and barotropic modes. This is only used
! if SPLIT is true.
READJUST_BT_TRANS = True ! [Boolean] default = False
! If true, make a barotropic adjustment to the layer
! velocities after the thermodynamic part of the step
! to ensure that the interaction between the thermodynamics
! and the continuity solver do not change the barotropic
! transport. This is only used if FLUX_BT_COUPLING and
! SPLIT are true.

! === module MOM_continuity ===

Expand All @@ -294,8 +277,6 @@ ETA_TOLERANCE = 1.0E-06 ! [m] default = 3.15E-09
! tolerance for SSH is 4 times this value. The default
! is 0.5*NK*ANGSTROM, and this should not be set less x
! than about 10^-15*MAXIMUM_DEPTH.
CONTINUITY_CFL_LIMIT = 1.0 ! [nondim] default = 0.5
! The maximum CFL of the adjusted velocities.
CONT_PPM_BETTER_ITER = False ! [Boolean] default = True
! If true, stop corrective iterations using a velocity
! based criterion and only stop if the iteration is
Expand Down Expand Up @@ -361,41 +342,11 @@ MAXVEL = 6.0 ! [m s-1] default = 3.0E+08
BOUND_BT_CORRECTION = True ! [Boolean] default = False
! If true, the corrective pseudo mass-fluxes into the
! barotropic solver are limited to values that require
! less than 0.1*MAXVEL to be accommodated.
USE_BT_CONT_TYPE = False ! [Boolean] default = True
! If true, use a structure with elements that describe
! effective face areas from the summed continuity solver
! as a function the barotropic flow in coupling between
! the barotropic and baroclinic flow. This is only used
! if SPLIT is true.
! less than maxCFL_BT_cont to be accommodated.
NONLINEAR_BT_CONTINUITY = True ! [Boolean] default = False
! If true, use nonlinear transports in the barotropic
! continuity equation. This does not apply if
! USE_BT_CONT_TYPE is true.
RESCALE_BT_FACE_AREAS = True ! [Boolean] default = False
! If true, the face areas used by the barotropic solver
! are rescaled to approximately reflect the open face
! areas of the interior layers. This probably requires
! FLUX_BT_COUPLING to work, and should not be used with
! USE_BT_CONT_TYPE.
BT_THICK_SCHEME = "HYBRID" ! default = "FROM_BT_CONT"
! A string describing the scheme that is used to set the
! open face areas used for barotropic transport and the
! relative weights of the accelerations. Valid values are:
! ARITHMETIC - arithmetic mean layer thicknesses
! HARMONIC - harmonic mean layer thicknesses
! HYBRID (the default) - use arithmetic means for
! layers above the shallowest bottom, the harmonic
! mean for layers below, and a weighted average for
! layers that straddle that depth
! FROM_BT_CONT - use the average thicknesses kept
! in the h_u and h_v fields of the BT_cont_type
BT_STRONG_DRAG = False ! [Boolean] default = True
! If true, use a stronger estimate of the retarding
! effects of strong bottom drag, by making it implicit
! with the barotropic time-step instead of implicit with
! the baroclinic time-step and dividing by the number of
! barotropic steps.
DT_BT_FILTER = 0.0 ! [sec or nondim] default = -0.25
! A time-scale over which the barotropic mode solutions
! are filtered, in seconds if positive, or as a fraction
Expand Down Expand Up @@ -599,7 +550,7 @@ VAR_PEN_SW = True ! [Boolean] default = False
! If true, use one of the CHL_A schemes specified by
! OPACITY_SCHEME to determine the e-folding depth of
! incoming short wave radiation.
CHL_FILE = "/seawifs_1998-2006_GOLD_smoothed_2X.nc" !
CHL_FILE = "seawifs_1998-2006_GOLD_smoothed_2X.nc" !
! CHL_FILE is the file containing chl_a concentrations in
! the variable CHL_A. It is used when VAR_PEN_SW and
! CHL_FROM_FILE are true.
Expand Down
Loading