Add more updates from GEOS-Chem 12.7.0

Add methanol emission updates from Xin Chen (UMN). Update MEGAN extension from .F to .F90. Also add the following updates: 1. Update initialization phase to not define certain species (ISOP, ACET, ALD2, C2H4, LIMO, MTPA, MTPO, PRPE, SESQ, SOAP, SOAS, EOH) when the OFFLINE_BIOGENICVOC option is turned on in HEMCO_Config.rc. This will allow use of offline biogenic VOC emissions for those species and online MEGAN emissions will be used for the rest of the species. Right now, just MOH from MEGAN will be fed back into the model and the remaining monoterpene species, methyl butenol, formic acid, and acetic acid will be used for diagnostic purposes only. 2. Remove support for MEGAN_Mono extension and just use MEGAN extension. Monoterpenes are now fully implemented in all full-chemistry simulations and emissions for those species should always be turned on when using MEGAN. This also avoids confusion having two extensions within a single extension module. 3. Add manual diagnostics for several monoterpene species, methyl butenol, formic acid, acetic acid so that they can be saved out via HEMCO_Diagn.rc. These manual diagnostics were formally defined in GeosCore/hcoi_gc_diagn_mod.F90 for saving out to BPCH but were removed with BPCH removal. 4. Move FLUX* arrays to extension instance 5. Clean up revision history comments and remove obsolete and unused code. Signed-off-by: Melissa Sulprizio <[email protected]>
geoschem · Jan 13, 2020 · 3897f4c · 3897f4c
1 parent 4b56f78
commit 3897f4c
Show file tree

Hide file tree

Showing 9 changed files with 5,246 additions and 5,154 deletions.
diff --git a/run/HEMCO_Config.template b/run/HEMCO_Config.template
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -1,3 +1,4 @@
 add_subdirectory(Core)
 add_subdirectory(Extensions)
 add_subdirectory(Interfaces)
+
diff --git a/src/Core/hco_config_mod.F90 b/src/Core/hco_config_mod.F90
@@ -3678,7 +3678,7 @@ SUBROUTINE Get_cID( ScalID, HcoConfig, cID, RC )
  IF ( cID <= 0 ) THEN
  WRITE ( strID, * ) ScalID
  MSG = 'Cannot find ScalID' // TRIM(strID)
- PRINT *,'cID negative for in HEMCO Get_cID'
+ PRINT *,'cID negative in HEMCO Get_cID'
  PRINT *, TRIM(MSG)
  RETURN
  ENDIF

diff --git a/src/Extensions/CMakeLists.txt b/src/Extensions/CMakeLists.txt
@@ -13,7 +13,7 @@ add_library(HCOX STATIC EXCLUDE_FROM_ALL
  hcox_gfed_mod.F90
  hcox_iodine_mod.F90
  hcox_lightnox_mod.F90
- hcox_megan_mod.F
+ hcox_megan_mod.F90
  hcox_paranox_mod.F90
  hcox_seaflux_mod.F90
  hcox_seasalt_mod.F90

diff --git a/src/Extensions/Makefile b/src/Extensions/Makefile
@@ -177,7 +177,7 @@ hcox_lightnox_mod.o : hcox_lightnox_mod.F90 \
  hcox_state_mod.o \
  hcox_tools_mod.o
 
-hcox_megan_mod.o : hcox_megan_mod.F  \
+hcox_megan_mod.o : hcox_megan_mod.F90 \
  hcox_state_mod.o
 
 hcox_paranox_mod.o : hcox_paranox_mod.F90 \

diff --git a/src/Extensions/hcox_gfed_mod.F90 b/src/Extensions/hcox_gfed_mod.F90
@@ -114,7 +114,8 @@ MODULE HCOX_GFED_MOD
  ! N_SPEC : Max. number of species
  !=================================================================
  INTEGER, PARAMETER :: N_EMFAC = 6
- INTEGER, PARAMETER :: N_SPEC = 34
+ INTEGER, PARAMETER :: N_SPEC = 35 ! increase from 34 (v12.5.0 default)
+ ! to 35 for MOH
 !
 ! !PRIVATE TYPES:
 !

diff --git a/src/Extensions/hcox_megan_mod.F b/src/Extensions/hcox_megan_mod.F