Code

Uvic ice dev#24

Code

Open

PatrickFarnole wants to merge 102 commits intogotm-model:mastergotm-model/code:masterfrom PatrickFarnole:uvic_ice_devPatrickFarnole/code:uvic_ice_devCopy head branch name to clipboard

+197-48

Commits

Commits on Jun 17, 2021

• added vars from ice_uvic

  

  Julia Putko

  committed
  7928790

  Copy full SHA for 7928790

• adding variables

  

  Julia Putko

  committed
  68b9b7f

  Copy full SHA for 68b9b7f

Commits on Jun 18, 2021

• change to register_all_variables and new commits in stim

  

  Julia Putko

  committed
  99e1c84

  Copy full SHA for 99e1c84

• adding stim commits

  

  Julia Putko

  committed
  d0aae13

  Copy full SHA for d0aae13

Commits on Jun 22, 2021

• Merge pull request #1 from juliaputko/uvic_ice_jp

  Show description for 4e49481
  PatrickFarnole

  authored
  4e49481

  Copy full SHA for 4e49481

• specified vars from stim in use:, excluded some vars from fm%register

  

  Julia Putko

  committed
  3fc23e7

  Copy full SHA for 3fc23e7

Commits on Jun 28, 2021

• made var in airsea public for use in ice, passing values in calls to subroutines in gotm, initializing the runwintonflato var added in the yaml

  

  Julia Putko

  committed
  057c0b9

  Copy full SHA for 057c0b9

• adding stim

  

  Julia Putko

  committed
  2131e5a

  Copy full SHA for 2131e5a

Commits on Jun 29, 2021

• adding stim

  

  Julia Putko

  committed
  988c9e2

  Copy full SHA for 988c9e2

• adding stim

  

  Julia Putko

  committed
  af7a59e

  Copy full SHA for af7a59e

Commits on Jun 30, 2021

• Merge pull request #2 from juliaputko/uvic_ice_jp

  Show description for d352a63
  PatrickFarnole

  authored
  d352a63

  Copy full SHA for d352a63

• adding stim

  

  Julia Putko

  committed
  09fb79c

  Copy full SHA for 09fb79c

• Merge pull request #3 from juliaputko/uvic_ice_jp

  Show description for 38c4847
  PatrickFarnole

  authored
  38c4847

  Copy full SHA for 38c4847

• adding stim

  

  Julia Putko

  committed
  324e98a

  Copy full SHA for 324e98a

• Merge pull request #4 from juliaputko/uvic_ice_jp

  Show description for 1e674f5
  PatrickFarnole

  authored
  1e674f5

  Copy full SHA for 1e674f5

• registering vars theta,sigma,kelvin,epsilon

  

  Julia Putko

  committed
  46d2b36

  Copy full SHA for 46d2b36

Commits on Jul 1, 2021

• adding stim

  

  Julia Putko

  committed
  d918eb0

  Copy full SHA for d918eb0

• Merge pull request #5 from juliaputko/uvic_ice_jp

  Show description for 70cba17
  PatrickFarnole

  authored
  70cba17

  Copy full SHA for 70cba17

• param passing more consistent with oldcode

  

  Julia Putko

  committed
  709d1e5

  Copy full SHA for 709d1e5

Commits on Jul 2, 2021

• adding stim

  

  Julia Putko

  committed
  b5b0fbe

  Copy full SHA for b5b0fbe

Commits on Jul 5, 2021

• Merge pull request #6 from juliaputko/uvic_ice_jp

  Show description for d5bd9d6
  PatrickFarnole

  authored
  d5bd9d6

  Copy full SHA for d5bd9d6

• adding stim

  

  Julia Putko

  committed
  2f17194

  Copy full SHA for 2f17194

• changes to resolve longwave_radiation_method value passing error

  

  Julia Putko

  committed
  712c772

  Copy full SHA for 712c772

Commits on Jul 6, 2021

• Merge pull request #7 from juliaputko/uvic_ice_jp

  Show description for 0526616
  PatrickFarnole

  authored
  0526616

  Copy full SHA for 0526616

Commits on Jul 8, 2021

• adding stim

  

  Julia Putko

  committed
  cba9d0f

  Copy full SHA for cba9d0f

• adding stim

  

  Julia Putko

  committed
  babdc5d

  Copy full SHA for babdc5d

Commits on Jul 12, 2021

• Merge pull request #8 from juliaputko/uvic_ice_jp

  Show description for 932c446
  PatrickFarnole

  authored
  932c446

  Copy full SHA for 932c446

Commits on Jul 13, 2021

• adding stim and added and removed vars from register_all_variables so that output file is consistent with mortenson

  

  Julia Putko

  committed
  7109c59

  Copy full SHA for 7109c59

• Merge pull request #9 from juliaputko/uvic_ice_jp

  Show description for 9dc4846
  PatrickFarnole

  authored
  9dc4846

  Copy full SHA for 9dc4846

Commits on Jul 15, 2021

• added new dimension

  

  Julia Putko

  committed
  6f099c9

  Copy full SHA for 6f099c9

Commits on Jul 16, 2021

• Merge pull request #10 from juliaputko/uvic_ice_jp

  Show description for 6e4d1b8
  PatrickFarnole

  authored
  6e4d1b8

  Copy full SHA for 6e4d1b8

Commits on Jul 20, 2021

• info for dimensions, addition to salinity is commented, if uncommente, simulation runs without kb error

  

  Julia Putko

  committed
  2f08c13

  Copy full SHA for 2f08c13

• Merge pull request #11 from juliaputko/uvic_ice_jp

  Show description for b3e316f
  PatrickFarnole

  authored
  b3e316f

  Copy full SHA for b3e316f

Commits on Jul 22, 2021

• adding flexout and stim,, removing z1,, update to Tice upper and lower bounds in register_all_variables

  

  Julia Putko

  committed
  78af89a

  Copy full SHA for 78af89a

Commits on Jul 23, 2021

• Merge pull request #12 from juliaputko/uvic_ice_jp

  Show description for 6ae31c9
  PatrickFarnole

  authored
  6ae31c9

  Copy full SHA for 6ae31c9

Commits on Jul 24, 2021

• adding stim

  

  Julia Putko

  committed
  d93c90e

  Copy full SHA for d93c90e

• cleaned up

  

  Julia Putko

  committed
  7e959de

  Copy full SHA for 7e959de

Commits on Jul 27, 2021

• changing bounds in register_all_variables

  

  Julia Putko

  committed
  c22dbd7

  Copy full SHA for c22dbd7

• Merge pull request #13 from juliaputko/uvic_ice_jp

  Show description for 285a391
  PatrickFarnole

  authored
  285a391

  Copy full SHA for 285a391

• writing Cond on the right indexes

  PatrickFarnole

  committed
  70723e8

  Copy full SHA for 70723e8

Commits on Jul 28, 2021

• changed dimensions of ice_uvic_zi, added zice and dzice

  

  Julia Putko

  committed
  097493e

  Copy full SHA for 097493e

• adding stim

  

  Julia Putko

  committed
  7eb4765

  Copy full SHA for 7eb4765

Commits on Jul 29, 2021

• Merge pull request #14 from juliaputko/uvic_ice_jp

  Show description for e71af8a
  PatrickFarnole

  authored
  e71af8a

  Copy full SHA for e71af8a

• fixed problem with ice_uvic_zi

  

  Julia Putko

  committed
  74f8ad7

  Copy full SHA for 74f8ad7

• Merge pull request #15 from juliaputko/uvic_ice_jp

  Show description for 0692132
  PatrickFarnole

  authored
  0692132

  Copy full SHA for 0692132

Commits on Jul 30, 2021

• adding stim

  

  Julia Putko

  committed
  968c623

  Copy full SHA for 968c623

Commits on Aug 1, 2021

• Merge pull request #16 from juliaputko/uvic_ice_jp

  Show description for a4635cd
  PatrickFarnole

  authored
  a4635cd

  Copy full SHA for a4635cd

Commits on Aug 4, 2021

• changed in salinity

  

  Julia Putko

  committed
  c93919b

  Copy full SHA for c93919b

• Merge pull request #17 from juliaputko/uvic_ice_jp

  Show description for 25024ff
  PatrickFarnole

  authored
  25024ff

  Copy full SHA for 25024ff

• clean

  

  Julia Putko

  committed
  cbf9226

  Copy full SHA for cbf9226

Commits on Aug 6, 2021

• adding vars from gotm_fabm.nml and fabm.nml

  

  Julia Putko

  committed
  d2aec78

  Copy full SHA for d2aec78

• removed _ICE_ condition from salinity

  

  Julia Putko

  committed
  19f0a35

  Copy full SHA for 19f0a35

• making vars available outside of ice

  

  Julia Putko

  committed
  e0a6754

  Copy full SHA for e0a6754

Commits on Aug 9, 2021

• Merge pull request #18 from juliaputko/uvic_ice_jp

  Show description for 6ac8610
  PatrickFarnole

  authored
  6ac8610

  Copy full SHA for 6ac8610

• adding model uvic to fabm

  

  Julia Putko

  committed
  223c406

  Copy full SHA for 223c406

Commits on Aug 10, 2021

• changes for new model

  

  Julia Putko

  committed
  bc861d5

  Copy full SHA for bc861d5

• Merge branch 'master' of github.com:gotm-model/code into uvic_fabm_jp

  

  Julia Putko

  committed
  9c8a1b5

  Copy full SHA for 9c8a1b5

Commits on Aug 11, 2021

• Merge branch 'master' of github.com:gotm-model/code into uvic_ice_dev

  PatrickFarnole

  committed
  92e706f

  Copy full SHA for 92e706f

• update submodules stim, fabm and flexout.

  PatrickFarnole

  committed
  272189a

  Copy full SHA for 272189a

• Adding stim

  PatrickFarnole

  committed
  1d04a55

  Copy full SHA for 1d04a55

Commits on Aug 16, 2021

• synch

  

  Julia Putko

  committed
  8138ac0

  Copy full SHA for 8138ac0

Commits on Aug 20, 2021

• Reference Patrick's forks for repository

  Show description for bd28648
  

  Andrew Shao

  authored and

  Andrew Shao

  committed
  bd28648

  Copy full SHA for bd28648

Commits on Aug 23, 2021

• Merge pull request #19 from ashao/pfarnole_submodules

  Show description for 01f8c64
  PatrickFarnole

  authored
  01f8c64

  Copy full SHA for 01f8c64

Commits on Aug 24, 2021

• adding Qfluxes_uvic

  

  Julia Putko

  committed
  84dbc76

  Copy full SHA for 84dbc76

Commits on Aug 25, 2021

• Merge pull request #20 from juliaputko/uvic_ice_jp

  Show description for 82932a4
  PatrickFarnole

  authored
  82932a4

  Copy full SHA for 82932a4

Commits on Aug 26, 2021

• Merge branch 'uvic_ice_dev' of github.com:PatrickFarnole/code into uvic_ice_dev

  PatrickFarnole

  committed
  f7e1abc

  Copy full SHA for f7e1abc

• Update .gitmodules

  Show description for 36b06a2
  PatrickFarnole

  authored
  36b06a2

  Copy full SHA for 36b06a2

• Merge branch 'uvic_ice_dev' of github.com:PatrickFarnole/code into uvic_ice_dev

  PatrickFarnole

  committed
  fdaab4f

  Copy full SHA for fdaab4f

Commits on Sep 1, 2021

• clean

  

  Julia Putko

  committed
  9684211

  Copy full SHA for 9684211

• adding fabm

  

  Julia Putko

  committed
  3269b2b

  Copy full SHA for 3269b2b

• adding fabm

  

  Julia Putko

  committed
  9958834

  Copy full SHA for 9958834

• clean

  

  Julia Putko

  committed
  9c5f155

  Copy full SHA for 9c5f155

• clean

  

  Julia Putko

  committed
  ac8735f

  Copy full SHA for ac8735f

• adding fabm

  

  Julia Putko

  committed
  add99fd

  Copy full SHA for add99fd

Commits on Oct 7, 2021

• Merge pull request #21 from juliaputko/uvic_fabm_jp

  Show description for bffc7e7
  PatrickFarnole

  authored
  bffc7e7

  Copy full SHA for bffc7e7

• adding fabm

  

  Julia Putko

  committed
  cfa77d9

  Copy full SHA for cfa77d9

Commits on Oct 10, 2021

• adding fabm

  

  Julia Putko

  committed
  55f1185

  Copy full SHA for 55f1185

• adding fabm

  

  Julia Putko

  committed
  b55b4a2

  Copy full SHA for b55b4a2

Commits on Oct 19, 2021

• Merge pull request #22 from juliaputko/uvic_fabm_jp

  Show description for ca7f28b
  PatrickFarnole

  authored
  ca7f28b

  Copy full SHA for ca7f28b

Commits on Nov 3, 2021

• merge from fabm branch

  

  Julia Putko

  committed
  59cd84e

  Copy full SHA for 59cd84e

Commits on Nov 5, 2021

• Merge pull request #23 from juliaputko/uvic_fabm_jp

  Show description for bdd61d8
  PatrickFarnole

  authored
  bdd61d8

  Copy full SHA for bdd61d8

• Merge branch 'PatrickFarnole:master' into uvic_fabm_jp

  juliaputko

  authored
  23738d4

  Copy full SHA for 23738d4

Commits on Dec 16, 2021

• changes in fabm and stim

  

  Julia Putko

  committed
  6d083ed

  Copy full SHA for 6d083ed

• Merge branch 'uvic_fabm_jp' of github.com:juliaputko/code into uvic_fabm_jp

  

  Julia Putko

  committed
  b1f5cf3

  Copy full SHA for b1f5cf3

Commits on Dec 21, 2021

• adding extern/fabm,flexout/stim

  

  Julia Putko

  committed
  9815c71

  Copy full SHA for 9815c71

• adding fabm - dms changes

  

  Julia Putko

  committed
  09169bc

  Copy full SHA for 09169bc

• flexout

  

  Julia Putko

  committed
  5d166ae

  Copy full SHA for 5d166ae

• added changed from commit1 2015a02

  

  bolding

  authored and

  Julia Putko

  committed
  f25f644

  Copy full SHA for f25f644

• fabm

  

  Julia Putko

  committed
  4db2007

  Copy full SHA for 4db2007

• changes from commit 2 22dd709

  

  bolding

  authored and

  Julia Putko

  committed
  2590787

  Copy full SHA for 2590787

• additional changes regarding longwave: FILE, ql_

  

  Julia Putko

  committed
  95dc096

  Copy full SHA for 95dc096

• Merge pull request #24 from juliaputko/uvic_ice_jp

  Show description for de8d9d2
  PatrickFarnole

  authored
  de8d9d2

  Copy full SHA for de8d9d2

Commits on Dec 22, 2021

• Merge branch 'uvic_ice_dev' of github.com:PatrickFarnole/code into uvic_ice_dev

  PatrickFarnole

  committed
  da17e01

  Copy full SHA for da17e01

• Merge branch 'uvic_ice_dev' into uvic_fabm_dev

  PatrickFarnole

  committed
  3b203e9

  Copy full SHA for 3b203e9

• adding case(clark) and fatal error message 93, removing comments

  

  Julia Putko

  committed
  60131b1

  Copy full SHA for 60131b1

Commits on Dec 23, 2021

• adding stim

  

  Julia Putko

  committed
  182f9b9

  Copy full SHA for 182f9b9

• Merge pull request #25 from juliaputko/uvic_ice_jp

  Show description for 85c2f53
  PatrickFarnole

  authored
  85c2f53

  Copy full SHA for 85c2f53

• Merge branch 'uvic_ice_dev' of github.com:PatrickFarnole/code into uvic_ice_dev

  PatrickFarnole

  committed
  166d616

  Copy full SHA for 166d616

• Merge branch 'uvic_ice_dev' into uvic_fabm_dev

  PatrickFarnole

  committed
  6f1a4b8

  Copy full SHA for 6f1a4b8

Commits on Dec 27, 2021

• longwave changes

  

  Julia Putko

  committed
  dd7de20

  Copy full SHA for dd7de20

Commits on Dec 30, 2021

• indentation correction

  

  Julia Putko

  committed
  24689aa

  Copy full SHA for 24689aa

Commits on Jan 5, 2022

• Merge pull request #26 from juliaputko/uvic_ice_jp

  Show description for 2ba9663
  PatrickFarnole

  authored
  2ba9663

  Copy full SHA for 2ba9663