Code

Adds first version of the MCT driver#578

Code

Merged

adcroft merged 62 commits intomom-ocean:dev/mastermom-ocean/MOM6:dev/masterfrom NCAR:dev/ncarNCAR/MOM6:dev/ncarCopy head branch name to clipboardAug 17, 2017

+1,043-28

Commits

Commits on Jun 23, 2017

• Removes frazil's contribution to evaporation

  Show description for 711a613
  gustavo-marques

  committed
  711a613

  Copy full SHA for 711a613

• Merge pull request #1 from gustavo-marques/ice_shelf

  Show description for 405fecb
  alperaltuntas

  authored
  405fecb

  Copy full SHA for 405fecb

Commits on Jun 29, 2017

• Moved blank ocn_comp_mct.F90

  alperaltuntas

  committed
  346097d

  Copy full SHA for 346097d

Commits on Jun 30, 2017

• Time and calendar initialization in ocn_comp_mct.F90

  alperaltuntas

  committed
  426357c

  Copy full SHA for 426357c

Commits on Jul 3, 2017

• Most initialization working

  alperaltuntas

  committed
  54f7976

  Copy full SHA for 54f7976

Commits on Jul 5, 2017

• Adds option to read initial temp and salt from separate files

  Show description for 86936ba
  gustavo-marques

  committed
  86936ba

  Copy full SHA for 86936ba

Commits on Jul 6, 2017

• Merge pull request #2 from gustavo-marques/temp_salt_z_init_file

  Show description for e8f2999
  alperaltuntas

  authored
  e8f2999

  Copy full SHA for e8f2999

• Merge pull request #3 from NCAR/dev/gfdl

  Show description for fa86163
  alperaltuntas

  authored
  fa86163

  Copy full SHA for fa86163

Commits on Jul 7, 2017

• Added coupler indices module

  alperaltuntas

  committed
  fbd405b

  Copy full SHA for fbd405b

• Merge pull request #4 from alperaltuntas/dev/ncar

  Show description for 2b794da
  alperaltuntas

  authored
  2b794da

  Copy full SHA for 2b794da

Commits on Jul 13, 2017

• Added ocn_import_export.F90

  alperaltuntas

  committed
  37e7356

  Copy full SHA for 37e7356

• Added methods to return domain/grid shape

  Show description for 57e6086
  alperaltuntas

  committed
  57e6086

  Copy full SHA for 57e6086

• Added method to point ponters to members of ocean_state_type

  Show description for 5df3bc3
  alperaltuntas

  committed
  5df3bc3

  Copy full SHA for 5df3bc3

• Completed ocn_init_mct

  alperaltuntas

  committed
  aba7dc2

  Copy full SHA for aba7dc2

• Added ocn_import_export module

  alperaltuntas

  committed
  ed3ed30

  Copy full SHA for ed3ed30

Commits on Jul 19, 2017

• Filled empty subroutines in ocn_comp_mct.F90

  alperaltuntas

  committed
  2540ed8

  Copy full SHA for 2540ed8

• added debugging

  alperaltuntas

  committed
  970f848

  Copy full SHA for 970f848

• Wrapped global data

  alperaltuntas

  committed
  8b38141

  Copy full SHA for 8b38141

Commits on Jul 20, 2017

• Got initialization working

  alperaltuntas

  committed
  3a923a2

  Copy full SHA for 3a923a2

• Merge pull request #5 from alperaltuntas/dev/ncar

  Show description for 231d19e
  alperaltuntas

  authored
  231d19e

  Copy full SHA for 231d19e

• Adds "only" for all use statements

  Show description for beac3ed
  adcroft

  committed
  beac3ed

  Copy full SHA for beac3ed

• Merge pull request #6 from adcroft/add-use-only-for-imports

  Show description for 5700d67
  alperaltuntas

  authored
  5700d67

  Copy full SHA for 5700d67

Commits on Jul 21, 2017

• Cleans up white space

  Show description for a1db77f
  adcroft

  committed
  a1db77f

  Copy full SHA for a1db77f

• Merge pull request #7 from adcroft/fix-mct-whitespace

  Show description for 7f2207c
  alperaltuntas

  authored
  7f2207c

  Copy full SHA for 7f2207c

• Adds placeholders for stepping foward MOM

  Show description for 714e8d6
  adcroft

  committed
  714e8d6

  Copy full SHA for 714e8d6

• Merge pull request #10 from adcroft/sketch-out-mct-run

  Show description for 3ceef26
  alperaltuntas

  authored
  3ceef26

  Copy full SHA for 3ceef26

Commits on Jul 24, 2017

• Filling ice_ocean_bnd, still needs work

  gustavo-marques

  committed
  5cd8d7a

  Copy full SHA for 5cd8d7a

Commits on Jul 25, 2017

• Replaces use of "surface" with "ocean_public_type"

  Show description for 1f39c84
  adcroft

  committed
  1f39c84

  Copy full SHA for 1f39c84

• Correct indexing when using ocean_public_type

  Show description for c83e238
  adcroft

  committed
  c83e238

  Copy full SHA for c83e238

• Merge pull request #11 from adcroft/use-ocn-public-for-surface

  Show description for a306c90
  alperaltuntas

  authored
  a306c90

  Copy full SHA for a306c90

• Filling ice_ocean_bnd - Draft

  gustavo-marques

  committed
  b69ab33

  Copy full SHA for b69ab33

• Merge branch 'dev/ncar' into fill_ice_ocean_bnd

  gustavo-marques

  committed
  d517719

  Copy full SHA for d517719

• Fix undefined reference to fill_ice_ocean_bnd

  gustavo-marques

  committed
  7ce40e5

  Copy full SHA for 7ce40e5

• Remove trailing whitespace

  gustavo-marques

  committed
  6b6289a

  Copy full SHA for 6b6289a

• Merge pull request #12 from gustavo-marques/fill_ice_ocean_bnd

  Show description for e6c5ddd
  alperaltuntas

  authored
  e6c5ddd

  Copy full SHA for e6c5ddd

• reorganize file structure

  alperaltuntas

  committed
  37a53bc

  Copy full SHA for 37a53bc

• Merge pull request #13 from alperaltuntas/dev/ncar

  Show description for cd58e2a
  alperaltuntas

  authored
  cd58e2a

  Copy full SHA for cd58e2a

• Clean the module and start doxygenizing it

  gustavo-marques

  committed
  f7c26a5

  Copy full SHA for f7c26a5

• Merge branch 'dev/ncar' into docs

  gustavo-marques

  committed
  4d346ca

  Copy full SHA for 4d346ca

• Merge pull request #14 from gustavo-marques/docs

  Show description for b403edd
  alperaltuntas

  authored
  b403edd

  Copy full SHA for b403edd

Commits on Jul 26, 2017

• Fix intent(inout) in ice_ocean_boundary

  gustavo-marques

  committed
  d77936e

  Copy full SHA for d77936e

• Adds reference to set_time that was lost during a conflict handling

  gustavo-marques

  committed
  31787c2

  Copy full SHA for 31787c2

• Merge pull request #15 from gustavo-marques/small_fixes

  Show description for f42c970
  alperaltuntas

  authored
  f42c970

  Copy full SHA for f42c970

Commits on Jul 28, 2017

• Avoids a SEGV when OBC are not in use with bi-harmonic friction

  Show description for fccb7ae
  adcroft

  committed
  fccb7ae

  Copy full SHA for fccb7ae

• (*)Fixes gprime(1) when no layer coordinates are set

  Show description for be46fee
  adcroft

  committed
  be46fee

  Copy full SHA for be46fee

• Merge pull request #16 from adcroft/ncar-cherry-picked-fixes

  Show description for 17d4586
  gustavo-marques

  authored
  17d4586

  Copy full SHA for 17d4586

• Fix ssh slope calculation

  gustavo-marques

  committed
  c04f081

  Copy full SHA for c04f081

• Merge pull request #17 from gustavo-marques/fix_ssh_slopes

  Show description for 76565cb
  alperaltuntas

  authored
  76565cb

  Copy full SHA for 76565cb

Commits on Jul 31, 2017

• Merge branch 'dev/master' into dev/ncar

  gustavo-marques

  committed
  be1e6cf

  Copy full SHA for be1e6cf

Commits on Aug 1, 2017

• Merge pull request #19 from gustavo-marques/new_merge

  Show description for 7480492
  alperaltuntas

  authored
  7480492

  Copy full SHA for 7480492

• Adds code that got lost during merge

  Show description for fb89b08
  gustavo-marques

  committed
  fb89b08

  Copy full SHA for fb89b08

• Merge pull request #20 from gustavo-marques/fix_merge

  Show description for 1bca79b
  alperaltuntas

  authored
  1bca79b

  Copy full SHA for 1bca79b

Commits on Aug 10, 2017

• Fixed clock and timing

  alperaltuntas

  committed
  06a30ab

  Copy full SHA for 06a30ab

• Fill IOB, some fluxes still need to be checked

  gustavo-marques

  committed
  58f78b9

  Copy full SHA for 58f78b9

• Adds run paramaters to control SW decomposition

  gustavo-marques

  committed
  2582e0a

  Copy full SHA for 2582e0a

• Merge pull request #21 from alperaltuntas/dev/ncar

  Show description for 369d5d6
  gustavo-marques

  authored
  369d5d6

  Copy full SHA for 369d5d6

• Merge branch 'dev/ncar' into check_fluxes

  gustavo-marques

  committed
  f6b22ff

  Copy full SHA for f6b22ff

Commits on Aug 11, 2017

• Fills additional IOB fluxes

  gustavo-marques

  committed
  8745b4b

  Copy full SHA for 8745b4b

• Adds option to write restart files

  gustavo-marques

  committed
  f5a8483

  Copy full SHA for f5a8483

• Merge pull request #22 from gustavo-marques/check_fluxes

  Show description for ba5b5ba
  alperaltuntas

  authored
  ba5b5ba

  Copy full SHA for ba5b5ba

Commits on Aug 15, 2017

• Merge MCT modules

  gustavo-marques

  committed
  a85b728

  Copy full SHA for a85b728

• Merge pull request #23 from gustavo-marques/combine_mct_modules

  Show description for f4f882f
  alperaltuntas

  authored
  f4f882f

  Copy full SHA for f4f882f