Merge branch 'dev' into docs/dev

geoschem · Aug 31, 2022 · fd11126 · fd11126
2 parents d08b920 + ec84dd2
commit fd11126
Show file tree

Hide file tree

Showing 11 changed files with 4 additions and 256 deletions.
diff --git a/.ci-pipelines/MinimumStandaloneTransportTracer b/.ci-pipelines/MinimumStandaloneTransportTracer
diff --git a/.ci-pipelines/build-matrix.yml b/.ci-pipelines/build-matrix.yml
diff --git a/.ci-pipelines/quick-build.yml b/.ci-pipelines/quick-build.yml
diff --git a/.ci-pipelines/release.dockerfile b/.ci-pipelines/release.dockerfile
diff --git a/.ci-pipelines/release.yml b/.ci-pipelines/release.yml
diff --git a/.gitmodules b/.gitmodules
@@ -31,6 +31,3 @@
 [submodule "docs/geos-chem-shared-docs"]
 	path = docs/source/geos-chem-shared-docs
 	url = https://github.com/geoschem/geos-chem-shared-docs.git
-[submodule ".ci-pipelines/MinimumStandaloneTransportTracer"]
-	path = .ci-pipelines/MinimumStandaloneTransportTracer
-	url = https://github.com/geoschem/MinimumStandaloneTransportTracer.git
diff --git a/README.md b/README.md
@@ -3,7 +3,6 @@
 <a href="http://wiki.seas.harvard.edu/geos-chem/index.php/GEOS-Chem_versions"><img src="https://img.shields.io/github/v/release/geoschem/GCHP?label=Latest%20Release"></a>
 [![DOI](https://zenodo.org/badge/200900441.svg)](https://zenodo.org/badge/latestdoi/200900441)
 <a href="https://gchp.readthedocs.io/en/latest/"><img src="https://img.shields.io/readthedocs/gchp?label=ReadTheDocs"></a>
-<a href="https://dev.azure.com/geoschem/GCHP/_build"><img src="https://img.shields.io/azure-devops/build/geoschem/GCHP/20/main?label=Build%20Matrix"></a><br>
 <a href="https://hub.docker.com/r/geoschem/gchp"><img src="https://img.shields.io/docker/v/geoschem/gchp?color=blue&label=Docker%2FSingularity"></a>
 <a href="https://spack.readthedocs.io/en/latest/package_list.html#gchp"><img src="https://img.shields.io/badge/Install%20with-Spack-ff69b4"></a>
 <a href="https://github.com/geoschem/GCHP/releases"><img src="https://img.shields.io/github/v/release/geoschem/GCHP?include_prereleases&label=Latest%20Pre-Release"></a>

diff --git a/src/GCHP_GridComp/GCHPctmEnv_GridComp/GCHPctmEnv_GridCompMod.F90 b/src/GCHP_GridComp/GCHPctmEnv_GridComp/GCHPctmEnv_GridCompMod.F90
@@ -524,7 +524,7 @@ subroutine prepare_massflux_exports(IMPORT, EXPORT, PLE, dt, RC)
          ! Get vertical mass flux
          call fv_getVerticalMassFlux(MFX_EXPORT, MFY_EXPORT, UpwardsMassFlux, dt)
          ! Flip vertical so that GCHP diagnostic is positive="up"
-         UpwardsMassFlux(:,:,:) = UpwardsMassFlux(:,:,LM:0:-1)
+         UpwardsMassFlux(:,:,:) = UpwardsMassFlux(:,:,LM:0:-1)/dt
       end if
 
       _RETURN(ESMF_SUCCESS)

diff --git a/src/GCHP_GridComp/GEOSChem_GridComp/geos-chem b/src/GCHP_GridComp/GEOSChem_GridComp/geos-chem
diff --git a/src/GCHP_GridComp/HEMCO_GridComp/HEMCO b/src/GCHP_GridComp/HEMCO_GridComp/HEMCO
diff --git a/src/MAPL b/src/MAPL