Code

Feature/coarsen on pressure#87

Code

Merged

oliverwm1 merged 79 commits intomasterai2cm/fv3net:masterfrom feature/coarsen-on-pressureai2cm/fv3net:feature/coarsen-on-pressureCopy head branch name to clipboardJan 15, 2020

+1,714-56

Commits

Commits on Dec 18, 2019

• Add calc/thermo.py

  

  Oliver Watt-Meyer

  committed
  6a5ea2d

  Copy full SHA for 6a5ea2d

• Add test_calc_thermo.py

  

  Oliver Watt-Meyer

  committed
  80b5f54

  Copy full SHA for 80b5f54

• Add remapz.py

  

  Oliver Watt-Meyer

  committed
  2f4b812

  Copy full SHA for 2f4b812

• Add coarse_grain_fv_core_on_pressure to coarsen.py

  

  Oliver Watt-Meyer

  committed
  0c15978

  Copy full SHA for 0c15978

• Rename some functions in thermo.py

  

  Oliver Watt-Meyer

  committed
  5a2494d

  Copy full SHA for 5a2494d

• Rename functions in test_calc_thermo.py

  

  Oliver Watt-Meyer

  committed
  779132b

  Copy full SHA for 779132b

• Add fortran remapping code mappm.f90

  

  Oliver Watt-Meyer

  committed
  53c8a0f

  Copy full SHA for 53c8a0f

• Refactor vertical remapping routines

  

  Oliver Watt-Meyer

  committed
  f9b903a

  Copy full SHA for f9b903a

• Fix first argument passed to create_fv3_grid

  

  Oliver Watt-Meyer

  committed
  fc54c94

  Copy full SHA for fc54c94

• Merge branch 'master' into feature/coarsen-on-pressure

  

  Oliver Watt-Meyer

  committed
  100fc56

  Copy full SHA for 100fc56

• Rename hydrostatic_dz_with_logp to hydrostatic_dz

  

  Oliver Watt-Meyer

  committed
  afbe2d0

  Copy full SHA for afbe2d0

• Fix block_upsample import

  

  Oliver Watt-Meyer

  committed
  7529eb2

  Copy full SHA for 7529eb2

• Add fv_tracer remap on pressure

  

  Oliver Watt-Meyer

  committed
  c00f677

  Copy full SHA for c00f677

• Specify x and y dimension names in args

  

  Oliver Watt-Meyer

  committed
  7889c3f

  Copy full SHA for 7889c3f

• Add x and y dimension names to function calls

  

  Oliver Watt-Meyer

  committed
  763553c

  Copy full SHA for 763553c

Commits on Dec 19, 2019

• Add placeholder for coarse_grain_phis function

  

  Oliver Watt-Meyer

  committed
  31159fe

  Copy full SHA for 31159fe

• Add impose_hydrostatic_balance and format

  

  Oliver Watt-Meyer

  committed
  1437b59

  Copy full SHA for 1437b59

• Add docstrings

  

  Oliver Watt-Meyer

  committed
  c5f7ca9

  Copy full SHA for c5f7ca9

• lint

  

  Oliver Watt-Meyer

  committed
  a5eb26c

  Copy full SHA for a5eb26c

• Fix create_fv3_grid import statement

  

  Oliver Watt-Meyer

  committed
  b2d9ed4

  Copy full SHA for b2d9ed4

• Update tests for thermo.py

  

  Oliver Watt-Meyer

  committed
  c60057d

  Copy full SHA for c60057d

• Pass argument dimension in thermo.py

  

  Oliver Watt-Meyer

  committed
  6aadbb0

  Copy full SHA for 6aadbb0

• Move mappm.f90 to external and add setup.py

  

  Oliver Watt-Meyer

  committed
  a900292

  Copy full SHA for a900292

• Add mappm installation to circleci config

  

  Oliver Watt-Meyer

  committed
  b8c888a

  Copy full SHA for b8c888a

• Revert mappm install on config.yml, make import optional

  

  Oliver Watt-Meyer

  committed
  1d85dda

  Copy full SHA for 1d85dda

• Fix assertion in remap_levels

  

  Oliver Watt-Meyer

  committed
  f6d6264

  Copy full SHA for f6d6264

Commits on Dec 20, 2019

• Make delp a ds before passing to create_fv3_grid

  

  Oliver Watt-Meyer

  committed
  0f989ba

  Copy full SHA for 0f989ba

• Bugfix/xgcm (#91)

  Show description for b9c0e04
  

  nbren12

  authored and

  Oliver Watt-Meyer

  committed
  b9c0e04

  Copy full SHA for b9c0e04

• Various fixes to remapz.py

  

  Oliver Watt-Meyer

  committed
  3b89cee

  Copy full SHA for 3b89cee

• Rename sphum yaxis for hydrostatic DZ calc

  

  Oliver Watt-Meyer

  committed
  777c2b0

  Copy full SHA for 777c2b0

• Fix thermo.py tests and add docstrings

  

  Oliver Watt-Meyer

  committed
  af362c8

  Copy full SHA for af362c8

• lint

  

  Oliver Watt-Meyer

  committed
  2b0e433

  Copy full SHA for 2b0e433

• Fix other_dim logic in remap_to_edge_weighted_pressure

  

  Oliver Watt-Meyer

  committed
  68f9668

  Copy full SHA for 68f9668

• Improve docstrings in remapz

  

  Oliver Watt-Meyer

  committed
  89a82d9

  Copy full SHA for 89a82d9

• Rename some thermo functions

  

  Oliver Watt-Meyer

  committed
  284687f

  Copy full SHA for 284687f

• Rename test in test_calc_thermo

  

  Oliver Watt-Meyer

  committed
  9a876ab

  Copy full SHA for 9a876ab

• Remove hard-coded dimension names from remapz.py

  

  Oliver Watt-Meyer

  committed
  3542195

  Copy full SHA for 3542195

• Add some header comments to mappm.f90

  

  Oliver Watt-Meyer

  committed
  1c07350

  Copy full SHA for 1c07350

• Merge branch 'master' into feature/coarsen-on-pressure

  

  Oliver Watt-Meyer

  committed
  b90885c

  Copy full SHA for b90885c

• Import dimension names from cubedsphere.constants

  

  Oliver Watt-Meyer

  committed
  34cb699

  Copy full SHA for 34cb699

Commits on Dec 21, 2019

• Add initial test_remapz.py

  

  Oliver Watt-Meyer

  committed
  9c761da

  Copy full SHA for 9c761da

Commits on Dec 23, 2019

• Address Spencer comments

  

  Oliver Watt-Meyer

  committed
  41af9e5

  Copy full SHA for 41af9e5

• Merge branch 'feature/coarsen-on-pressure' of github.com:VulcanClimateModeling/fv3net into feature/coarsen-on-pressure

  

  Oliver Watt-Meyer

  committed
  65a7033

  Copy full SHA for 65a7033

• Fix test_remapz.py

  

  Oliver Watt-Meyer

  committed
  6b3d54c

  Copy full SHA for 6b3d54c

• Update thermo.py for Spencer's comments

  

  Oliver Watt-Meyer

  committed
  084abca

  Copy full SHA for 084abca

• Fix test_calc_thermo.py

  

  Oliver Watt-Meyer

  committed
  7c248c6

  Copy full SHA for 7c248c6

• Allow remap_levels output to have changed # levels

  

  Oliver Watt-Meyer

  committed
  825b343

  Copy full SHA for 825b343

• Make thermo routines output DataArrays not variables

  

  Oliver Watt-Meyer

  committed
  e19e892

  Copy full SHA for e19e892

• Fix test_remapz.py

  

  Oliver Watt-Meyer

  committed
  dda5da3

  Copy full SHA for dda5da3

• Fix remapz.py for DataArray thermo.py outputs

  

  Oliver Watt-Meyer

  committed
  adf157c

  Copy full SHA for adf157c

• Merge branch 'feature/coarsen-on-pressure' of github.com:VulcanClimateModeling/fv3net into feature/coarsen-on-pressure

  

  Oliver Watt-Meyer

  committed
  8f96003

  Copy full SHA for 8f96003

• Make thermo routines return DataArray with no coord

  

  Oliver Watt-Meyer

  committed
  252f99e

  Copy full SHA for 252f99e

Commits on Dec 24, 2019

• Rename phalf vertical coord when masking weights

  

  Oliver Watt-Meyer

  committed
  083167c

  Copy full SHA for 083167c

• Make flake8 ignore E203, don't import mappm in test

  

  Oliver Watt-Meyer

  committed
  666f509

  Copy full SHA for 666f509

• Remove whitespace on empty line

  

  Oliver Watt-Meyer

  committed
  18cfe21

  Copy full SHA for 18cfe21

• Remove whitespace on empty line

  

  Oliver Watt-Meyer

  committed
  40d8def

  Copy full SHA for 40d8def

• Make flake8 ignore consistent with black

  

  Oliver Watt-Meyer

  committed
  ae8c144

  Copy full SHA for ae8c144

• Cast phalf to variable before masking comparison

  

  Oliver Watt-Meyer

  committed
  60f79e1

  Copy full SHA for 60f79e1

• Move flake8 E203 ignore to setup.cfg

  

  Oliver Watt-Meyer

  committed
  bdf44eb

  Copy full SHA for bdf44eb

• Return phalf with z coordinate

  

  Oliver Watt-Meyer

  committed
  db92226

  Copy full SHA for db92226

• Make height calc in impose_hydrostatic_balance use dim

  

  Oliver Watt-Meyer

  committed
  caac9ee

  Copy full SHA for caac9ee

• Refactor weight masking, fix dimension ordering

  

  Oliver Watt-Meyer

  committed
  527bb0b

  Copy full SHA for 527bb0b

• Add _mask_weights test

  

  Oliver Watt-Meyer

  committed
  7e92faa

  Copy full SHA for 7e92faa

• Fix thermo tests

  

  Oliver Watt-Meyer

  committed
  f83595e

  Copy full SHA for f83595e

Commits on Jan 2, 2020

• Move _block_upsample_like to coarsen.py and make public

  

  Oliver Watt-Meyer

  committed
  c380d39

  Copy full SHA for c380d39

• Generalize block_upsample_like to handle staggered dims

  

  Oliver Watt-Meyer

  committed
  d19b426

  Copy full SHA for d19b426

• Use block_upsample_like in remapz.py

  

  Oliver Watt-Meyer

  committed
  2011bc4

  Copy full SHA for 2011bc4

• Remove unused import statement

  

  Oliver Watt-Meyer

  committed
  f0b5494

  Copy full SHA for f0b5494

• Ensure chunks are set using right dimension order

  

  Oliver Watt-Meyer

  committed
  717eb4a

  Copy full SHA for 717eb4a

• Add coordinate for staggered delp

  

  Oliver Watt-Meyer

  committed
  b395f84

  Copy full SHA for b395f84

• Remove dtype specification for staggered delp coord

  

  Oliver Watt-Meyer

  committed
  3cad648

  Copy full SHA for 3cad648

• Revert virtual temperature calc to approximate version

  

  Oliver Watt-Meyer

  committed
  5c976de

  Copy full SHA for 5c976de

Commits on Jan 3, 2020

• Use lower coordinate in dlogp calculation output

  

  Oliver Watt-Meyer

  committed
  c914fbd

  Copy full SHA for c914fbd

• Use exact virtual tempearture

  

  Oliver Watt-Meyer

  committed
  43f61f8

  Copy full SHA for 43f61f8

• Fix midpoint pressure calc and add docstrings

  

  Oliver Watt-Meyer

  committed
  8d334c9

  Copy full SHA for 8d334c9

• Make virtual t calc consistent with fv3gfs

  

  Oliver Watt-Meyer

  committed
  51e5af7

  Copy full SHA for 51e5af7

• Add tests for _add_coords

  

  Oliver Watt-Meyer

  committed
  31af7a3

  Copy full SHA for 31af7a3

Commits on Jan 6, 2020

• Address Noah comments

  

  Oliver Watt-Meyer

  committed
  840596b

  Copy full SHA for 840596b

Commits on Jan 15, 2020

• Merge branch 'master' into feature/coarsen-on-pressure

  

  Oliver Watt-Meyer

  authored
  23d0813

  Copy full SHA for 23d0813