Skip to content

Commit 451e933

Browse files
jimmielinjimmielin
committed
Fix wrong LATRES flag (0.5->05) and remove CESM-GC recognition
1 parent 4cabdc9 commit 451e933

File tree

2 files changed

+17
-45
lines changed

2 files changed

+17
-45
lines changed

‎HEMCO_Config.rc.test

+17-17
Original file line numberDiff line numberDiff line change
@@ -2324,35 +2324,35 @@ Warnings: 1
23242324
#==============================================================================
23252325
(((OFFLINE_DUST
23262326
(((.not.DustDead.or.DustGinoux
2327-
0 EMIS_DST1 $ROOT/OFFLINE_DUST/v2019-01/0.5x0.625/$YYYY/$MM/dust_emissions_0.5.$YYYY$MM$DD.nc EMIS_DST1 1980-2017/1-12/1-31/* C xy kg/m2/s DST1 606 3 2
2328-
0 EMIS_DST2 $ROOT/OFFLINE_DUST/v2019-01/0.5x0.625/$YYYY/$MM/dust_emissions_0.5.$YYYY$MM$DD.nc EMIS_DST2 1980-2017/1-12/1-31/* C xy kg/m2/s DST2 606 3 2
2329-
0 EMIS_DST3 $ROOT/OFFLINE_DUST/v2019-01/0.5x0.625/$YYYY/$MM/dust_emissions_0.5.$YYYY$MM$DD.nc EMIS_DST3 1980-2017/1-12/1-31/* C xy kg/m2/s DST3 606 3 2
2330-
0 EMIS_DST4 $ROOT/OFFLINE_DUST/v2019-01/0.5x0.625/$YYYY/$MM/dust_emissions_0.5.$YYYY$MM$DD.nc EMIS_DST4 1980-2017/1-12/1-31/* C xy kg/m2/s DST4 606 3 2
2327+
0 EMIS_DST1 $ROOT/OFFLINE_DUST/v2019-01/0.5x0.625/$YYYY/$MM/dust_emissions_05.$YYYY$MM$DD.nc EMIS_DST1 1980-2017/1-12/1-31/* C xy kg/m2/s DST1 606 3 2
2328+
0 EMIS_DST2 $ROOT/OFFLINE_DUST/v2019-01/0.5x0.625/$YYYY/$MM/dust_emissions_05.$YYYY$MM$DD.nc EMIS_DST2 1980-2017/1-12/1-31/* C xy kg/m2/s DST2 606 3 2
2329+
0 EMIS_DST3 $ROOT/OFFLINE_DUST/v2019-01/0.5x0.625/$YYYY/$MM/dust_emissions_05.$YYYY$MM$DD.nc EMIS_DST3 1980-2017/1-12/1-31/* C xy kg/m2/s DST3 606 3 2
2330+
0 EMIS_DST4 $ROOT/OFFLINE_DUST/v2019-01/0.5x0.625/$YYYY/$MM/dust_emissions_05.$YYYY$MM$DD.nc EMIS_DST4 1980-2017/1-12/1-31/* C xy kg/m2/s DST4 606 3 2
23312331
))).not.DustDead.or.DustGinoux
23322332
)))OFFLINE_DUST
23332333

23342334
#==============================================================================
23352335
# --- Offline biogenic VOC emissions ---
23362336
#==============================================================================
23372337
(((OFFLINE_BIOGENICVOC
2338-
0 BIOGENIC_ACET $ROOT/OFFLINE_BIOVOC/v2019-10/0.5x0.625/$YYYY/$MM/biovoc_0.5.$YYYY$MM$DD.nc ACET_MEGAN 1980-2017/1-12/1-31/* C xy kgC/m2/s ACET 40 4 2
2339-
0 BIOGENIC_ALD2 $ROOT/OFFLINE_BIOVOC/v2019-10/0.5x0.625/$YYYY/$MM/biovoc_0.5.$YYYY$MM$DD.nc ALD2_MEGAN 1980-2017/1-12/1-31/* C xy kgC/m2/s ALD2 41 4 2
2340-
0 BIOGENIC_C2H4 $ROOT/OFFLINE_BIOVOC/v2019-10/0.5x0.625/$YYYY/$MM/biovoc_0.5.$YYYY$MM$DD.nc C2H4_MEGAN 1980-2017/1-12/1-31/* C xy kgC/m2/s C2H4 44 4 2
2341-
0 BIOGENIC_EOH $ROOT/OFFLINE_BIOVOC/v2019-10/0.5x0.625/$YYYY/$MM/biovoc_0.5.$YYYY$MM$DD.nc EOH_MEGAN 1980-2017/1-12/1-31/* C xy kgC/m2/s EOH 47 4 2
2342-
0 BIOGENIC_ISOP $ROOT/OFFLINE_BIOVOC/v2019-10/0.5x0.625/$YYYY/$MM/biovoc_0.5.$YYYY$MM$DD.nc ISOP_MEGAN 1980-2017/1-12/1-31/* C xy kgC/m2/s ISOP 61 4 2
2338+
0 BIOGENIC_ACET $ROOT/OFFLINE_BIOVOC/v2019-10/0.5x0.625/$YYYY/$MM/biovoc_05.$YYYY$MM$DD.nc ACET_MEGAN 1980-2017/1-12/1-31/* C xy kgC/m2/s ACET 40 4 2
2339+
0 BIOGENIC_ALD2 $ROOT/OFFLINE_BIOVOC/v2019-10/0.5x0.625/$YYYY/$MM/biovoc_05.$YYYY$MM$DD.nc ALD2_MEGAN 1980-2017/1-12/1-31/* C xy kgC/m2/s ALD2 41 4 2
2340+
0 BIOGENIC_C2H4 $ROOT/OFFLINE_BIOVOC/v2019-10/0.5x0.625/$YYYY/$MM/biovoc_05.$YYYY$MM$DD.nc C2H4_MEGAN 1980-2017/1-12/1-31/* C xy kgC/m2/s C2H4 44 4 2
2341+
0 BIOGENIC_EOH $ROOT/OFFLINE_BIOVOC/v2019-10/0.5x0.625/$YYYY/$MM/biovoc_05.$YYYY$MM$DD.nc EOH_MEGAN 1980-2017/1-12/1-31/* C xy kgC/m2/s EOH 47 4 2
2342+
0 BIOGENIC_ISOP $ROOT/OFFLINE_BIOVOC/v2019-10/0.5x0.625/$YYYY/$MM/biovoc_05.$YYYY$MM$DD.nc ISOP_MEGAN 1980-2017/1-12/1-31/* C xy kgC/m2/s ISOP 61 4 2
23432343
0 BIOGENIC_ISOP_SOAP - - - - - - SOAP 610 4 2
23442344
0 BIOGENIC_ISOP_SOAS - - - - - - SOAS 610 4 2
2345-
0 BIOGENIC_LIMO $ROOT/OFFLINE_BIOVOC/v2019-10/0.5x0.625/$YYYY/$MM/biovoc_0.5.$YYYY$MM$DD.nc LIMO_MEGAN 1980-2017/1-12/1-31/* C xy kgC/m2/s LIMO - 4 2
2345+
0 BIOGENIC_LIMO $ROOT/OFFLINE_BIOVOC/v2019-10/0.5x0.625/$YYYY/$MM/biovoc_05.$YYYY$MM$DD.nc LIMO_MEGAN 1980-2017/1-12/1-31/* C xy kgC/m2/s LIMO - 4 2
23462346
0 BIOGENIC_LIMO_SOAP - - - - - - SOAP 611 4 2
23472347
0 BIOGENIC_LIMO_SOAS - - - - - - SOAS 611 4 2
2348-
0 BIOGENIC_MTPA $ROOT/OFFLINE_BIOVOC/v2019-10/0.5x0.625/$YYYY/$MM/biovoc_0.5.$YYYY$MM$DD.nc MTPA_MEGAN 1980-2017/1-12/1-31/* C xy kgC/m2/s MTPA - 4 2
2348+
0 BIOGENIC_MTPA $ROOT/OFFLINE_BIOVOC/v2019-10/0.5x0.625/$YYYY/$MM/biovoc_05.$YYYY$MM$DD.nc MTPA_MEGAN 1980-2017/1-12/1-31/* C xy kgC/m2/s MTPA - 4 2
23492349
0 BIOGENIC_MTPA_SOAP - - - - - - SOAP 611 4 2
23502350
0 BIOGENIC_MTPA_SOAS - - - - - - SOAS 611 4 2
2351-
0 BIOGENIC_MTPO $ROOT/OFFLINE_BIOVOC/v2019-10/0.5x0.625/$YYYY/$MM/biovoc_0.5.$YYYY$MM$DD.nc MTPO_MEGAN 1980-2017/1-12/1-31/* C xy kgC/m2/s MTPO - 4 2
2351+
0 BIOGENIC_MTPO $ROOT/OFFLINE_BIOVOC/v2019-10/0.5x0.625/$YYYY/$MM/biovoc_05.$YYYY$MM$DD.nc MTPO_MEGAN 1980-2017/1-12/1-31/* C xy kgC/m2/s MTPO - 4 2
23522352
0 BIOGENIC_MTPO_SOAP - - - - - - SOAP 611 4 2
23532353
0 BIOGENIC_MTPO_SOAS - - - - - - SOAS 611 4 2
2354-
0 BIOGENIC_PRPE $ROOT/OFFLINE_BIOVOC/v2019-10/0.5x0.625/$YYYY/$MM/biovoc_0.5.$YYYY$MM$DD.nc PRPE_MEGAN 1980-2017/1-12/1-31/* C xy kgC/m2/s PRPE 49 4 2
2355-
0 BIOGENIC_SESQ $ROOT/OFFLINE_BIOVOC/v2019-10/0.5x0.625/$YYYY/$MM/biovoc_0.5.$YYYY$MM$DD.nc SESQ_MEGAN 1980-2017/1-12/1-31/* C xy kgC/m2/s SESQ - 4 2
2354+
0 BIOGENIC_PRPE $ROOT/OFFLINE_BIOVOC/v2019-10/0.5x0.625/$YYYY/$MM/biovoc_05.$YYYY$MM$DD.nc PRPE_MEGAN 1980-2017/1-12/1-31/* C xy kgC/m2/s PRPE 49 4 2
2355+
0 BIOGENIC_SESQ $ROOT/OFFLINE_BIOVOC/v2019-10/0.5x0.625/$YYYY/$MM/biovoc_05.$YYYY$MM$DD.nc SESQ_MEGAN 1980-2017/1-12/1-31/* C xy kgC/m2/s SESQ - 4 2
23562356
0 BIOGENIC_SESQ_SOAP - - - - - - SOAP 612 4 2
23572357
0 BIOGENIC_SESQ_SOAS - - - - - - SOAS 612 4 2
23582358
)))OFFLINE_BIOGENICVOC
@@ -2362,11 +2362,11 @@ Warnings: 1
23622362
#==============================================================================
23632363
(((OFFLINE_SEASALT
23642364
(((.not.SeaSalt
2365-
0 SEASALT_SALA $ROOT/OFFLINE_SEASALT/v2019-01/0.5x0.625/$YYYY/$MM/seasalt_0.5.$YYYY$MM$DD.nc SALA_TOTAL 1980-2017/1-12/1-31/* C xy kg/m2/s SALA - 3 2
2365+
0 SEASALT_SALA $ROOT/OFFLINE_SEASALT/v2019-01/0.5x0.625/$YYYY/$MM/seasalt_05.$YYYY$MM$DD.nc SALA_TOTAL 1980-2017/1-12/1-31/* C xy kg/m2/s SALA - 3 2
23662366
0 SEASALT_SALAAL - - - - - - SALAAL 615 3 2
23672367
0 SEASALT_SALACL - - - - - - SALACL 616 3 2
23682368
0 SEASALT_BrSALA - - - - - - BrSALA 617 3 2
2369-
0 SEASALT_SALC $ROOT/OFFLINE_SEASALT/v2019-01/0.5x0.625/$YYYY/$MM/seasalt_0.5.$YYYY$MM$DD.nc SALC_TOTAL 1980-2017/1-12/1-31/* C xy kg/m2/s SALC - 3 2
2369+
0 SEASALT_SALC $ROOT/OFFLINE_SEASALT/v2019-01/0.5x0.625/$YYYY/$MM/seasalt_05.$YYYY$MM$DD.nc SALC_TOTAL 1980-2017/1-12/1-31/* C xy kg/m2/s SALC - 3 2
23702370
0 SEASALT_SALCAL - - - - - - SALCAL 615 3 2
23712371
0 SEASALT_SALCCL - - - - - - SALCCL 616 3 2
23722372
0 SEASALT_BrSALC - - - - - - BrSALC 617 3 2
@@ -2378,7 +2378,7 @@ Warnings: 1
23782378
#==============================================================================
23792379
(((OFFLINE_SOILNOX
23802380
(((.not.SoilNOx
2381-
0 SOILNOX_NO $ROOT/OFFLINE_SOILNOX/v2019-01/0.5x0.625/$YYYY/$MM/soilnox_0.5.$YYYY$MM$DD.nc SOIL_NOx 1980-2017/1-12/1-31/* C xy kg/m2/s NO - 3 2
2381+
0 SOILNOX_NO $ROOT/OFFLINE_SOILNOX/v2019-01/0.5x0.625/$YYYY/$MM/soilnox_05.$YYYY$MM$DD.nc SOIL_NOx 1980-2017/1-12/1-31/* C xy kg/m2/s NO - 3 2
23822382
))).not.SoilNOx
23832383
)))OFFLINE_SOILNOX
23842384

‎hemco_interface.F90

-28
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,6 @@ module hemco_interface
3838
use mo_tracname, only: solsym ! species names
3939
use mo_chem_utls, only: get_spc_ndx ! IND_
4040

41-
! Species information (CESM-GC) (temporary kludge)
42-
#if defined( EXTERNAL_FORCING )
43-
use chem_mods, only: nTracers, tracerNames
44-
use chem_mods, only: MWRatio
45-
#endif
46-
4741
! Grid
4842
use ppgrid, only: pcols, pver ! Cols, verts
4943
use ppgrid, only: begchunk, endchunk ! Chunk idxs
@@ -442,16 +436,10 @@ subroutine HCOI_Chunk_Init()
442436
!-----------------------------------------------------------------------
443437
if(masterproc) write(iulog,*) "> Initializing HCO configuration object"
444438

445-
! Very ugly hack to recognize CESM-GC: Change TBD
446-
#if !defined( EXTERNAL_FORCING )
447439
! We are using gas_pcnst here, which is # of "gas phase" species.
448440
! This might be changed down the line but we are reading chem_mods
449441
! for now.
450442
nHcoSpc = gas_pcnst ! # of hco species? using gas
451-
#else
452-
! Working with CESM-GC: use nTracers. To coordinate with tmmf
453-
nHcoSpc = nTracers
454-
#endif
455443

456444
call ConfigInit(HcoConfig, HMRC, nModelSpecies=nHcoSpc)
457445
ASSERT_(HMRC==HCO_SUCCESS)
@@ -475,12 +463,7 @@ subroutine HCOI_Chunk_Init()
475463
do N = 1, nHcoSpc
476464
HcoConfig%ModelSpc(N)%ModID = N ! model id
477465

478-
! Ugly kludge to recognize CESM-GC (using EXTERNAL_FORCING) (hplin, 5/16/20)
479-
#if !defined( EXTERNAL_FORCING )
480466
HcoConfig%ModelSpc(N)%SpcName = trim(solsym(N))
481-
#else
482-
HcoConfig%ModelSpc(N)%SpcName = trim(tracerNames(N))
483-
#endif
484467

485468
!----------------------------------------------
486469
! Register export properties.
@@ -557,19 +540,8 @@ subroutine HCOI_Chunk_Init()
557540
!-----------------------------------------------------------------------
558541
do N = 1, nHcoSpc
559542
HcoState%Spc(N)%ModID = N ! model id
560-
561-
! Ugly kludge to recognize CESM-GC (using EXTERNAL_FORCING) (hplin, 5/16/20)
562-
#if !defined( EXTERNAL_FORCING )
563543
HcoState%Spc(N)%SpcName = trim(solsym(N)) ! species name
564-
565544
HcoState%Spc(N)%MW_g = adv_mass(N) ! mol. weight [g/mol]
566-
#else
567-
! CESM-GC has all necessary data, maybe,
568-
! FIXME: to coordinate EmMW_g with TMMF (hplin, 5/16/20)
569-
HcoState%Spc(N)%SpcName = trim(tracerNames(N)) ! species name
570-
571-
HcoState%Spc(N)%MW_g = adv_Mass(N) ! mol. weight [g/mol]
572-
#endif
573545

574546
! !!! We don't set Henry's law coefficients in HEMCO_CESM !!!
575547
! they are mostly used in HCOX_SeaFlux_Mod, but HCOX are unsupported (for now)

0 commit comments

Comments
 (0)