Skip to content

Commit

Permalink
Finished the work on the new timing option
Browse files Browse the repository at this point in the history
  • Loading branch information
@mmanyin
mmanyin committed Dec 29, 2023
1 parent cccee35 commit 63ff970
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 17 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- Connectivity from GMI to ACHEM (4 fields), requires GMI v1.2.0 or later to run
- Slight improvement for lightning flash rate calculation (LOPEZ and MOIST schemes). See the option UsePreconCape in ChemEnv.rc . This involves new imports from MOIST: CAPE, BYNCY and INHB. **NOTE** THIS REQUIRES GEOSgcm_GridComp develop branch (as of 12/12/23).
- Added a flag for 'strict' child timing, intended to reduce the timing bias against child GC's that employ 'gather' calls. Such calls are occasionally necessary, but can cause timers to attribute excessive time to a child, time that is actually the synchronization lag time that would eventually be spent -somewhere- in the program, but which gets attributed to the child with a 'gather' or barrier call. The new flag is for timing tests only.

### Removed

Expand Down
36 changes: 19 additions & 17 deletions GEOS_ChemGridComp.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,8 @@ subroutine SetServices ( GC, RC )
! ErrLog Variables

__Iam__('SetServices') ! NOTE: this macro declares STATUS
! ALSO: Never set Iam = TRIM(Iam) // suffix
! ALSO: Never set Iam to a string containing Iam
! in any routine that is run more than once
! because Iam is a SAVED varaible
character(len=ESMF_MAXSTR) :: COMP_NAME

Expand Down Expand Up @@ -247,23 +248,23 @@ subroutine SetServices ( GC, RC )
! -----------------------------------------------------------------
CHEMENV = MAPL_AddChild(GC, NAME='CHEMENV', SS=ChemEnv_SetServices, __RC__)

if ( myState%enable_HEMCO) HEMCO = MAPL_AddChild(GC, NAME= 'HEMCO', SS=HEMCO_SetServices, __RC__)
if ( myState%enable_PCHEM) PCHEM = MAPL_AddChild(GC, NAME= 'PCHEM', SS=PChem_SetServices, __RC__)
if ( myState%enable_ACHEM) ACHEM = MAPL_AddChild(GC, NAME= 'ACHEM', SS=AChem_SetServices, __RC__)
if ( myState%enable_GOCART) GOCART = MAPL_AddChild(GC, NAME= 'GOCART', SS=GOCART_SetServices, __RC__)
if (myState%enable_HEMCO ) HEMCO = MAPL_AddChild(GC, NAME= 'HEMCO', SS=HEMCO_SetServices, __RC__)
if (myState%enable_PCHEM ) PCHEM = MAPL_AddChild(GC, NAME= 'PCHEM', SS=PChem_SetServices, __RC__)
if (myState%enable_ACHEM ) ACHEM = MAPL_AddChild(GC, NAME= 'ACHEM', SS=AChem_SetServices, __RC__)
if (myState%enable_GOCART ) GOCART = MAPL_AddChild(GC, NAME= 'GOCART', SS=GOCART_SetServices, __RC__)
if (myState%enable_GOCARTdata) GOCARTdata = MAPL_AddChild(GC, NAME= 'GOCART.data', SS=GOCART_SetServices, __RC__)
if ( myState%enable_GOCART2G) GOCART2G = MAPL_AddChild(GC, NAME= 'GOCART2G', SS=GOCART2G_SetServices, __RC__)
if ( myState%enable_GAAS) GAAS = MAPL_AddChild(GC, NAME= 'GAAS', SS=GAAS_SetServices, __RC__)
if ( myState%enable_H2O) H2O = MAPL_AddChild(GC, NAME= 'H2O', SS=H2O_SetServices, __RC__)
if ( myState%enable_STRATCHEM) STRATCHEM = MAPL_AddChild(GC, NAME= 'STRATCHEM', SS=StratChem_SetServices, __RC__)
if ( myState%enable_GMICHEM) GMICHEM = MAPL_AddChild(GC, NAME= 'GMICHEM', SS=GMI_SetServices, __RC__)
if ( myState%enable_CARMA) CARMA = MAPL_AddChild(GC, NAME= 'CARMA', SS=CARMA_SetServices, __RC__)
if ( myState%enable_GEOSCHEM) GEOSCHEM = MAPL_AddChild(GC, NAME='GEOSCHEMCHEM', SS=GCChem_SetServices, __RC__)
if ( myState%enable_MATRIX) MATRIX = MAPL_AddChild(GC, NAME= 'MATRIX', SS=MATRIX_SetServices, __RC__)
if ( myState%enable_MAM) MAM = MAPL_AddChild(GC, NAME= 'MAM', SS=MAM_SetServices, __RC__)
if ( myState%enable_MAMdata) MAMdata = MAPL_AddChild(GC, NAME= 'MAM.data', SS=MAM_SetServices, __RC__)
if ( myState%enable_TR) TR = MAPL_AddChild(GC, NAME= 'TR', SS=TR_SetServices, __RC__)
if ( myState%enable_DNA) DNA = MAPL_AddChild(GC, NAME= 'DNA', SS=DNA_SetServices, __RC__)
if (myState%enable_GOCART2G ) GOCART2G = MAPL_AddChild(GC, NAME= 'GOCART2G', SS=GOCART2G_SetServices, __RC__)
if (myState%enable_GAAS ) GAAS = MAPL_AddChild(GC, NAME= 'GAAS', SS=GAAS_SetServices, __RC__)
if (myState%enable_H2O ) H2O = MAPL_AddChild(GC, NAME= 'H2O', SS=H2O_SetServices, __RC__)
if (myState%enable_STRATCHEM ) STRATCHEM = MAPL_AddChild(GC, NAME= 'STRATCHEM', SS=StratChem_SetServices, __RC__)
if (myState%enable_GMICHEM ) GMICHEM = MAPL_AddChild(GC, NAME= 'GMICHEM', SS=GMI_SetServices, __RC__)
if (myState%enable_CARMA ) CARMA = MAPL_AddChild(GC, NAME= 'CARMA', SS=CARMA_SetServices, __RC__)
if (myState%enable_GEOSCHEM ) GEOSCHEM = MAPL_AddChild(GC, NAME='GEOSCHEMCHEM', SS=GCChem_SetServices, __RC__)
if (myState%enable_MATRIX ) MATRIX = MAPL_AddChild(GC, NAME= 'MATRIX', SS=MATRIX_SetServices, __RC__)
if (myState%enable_MAM ) MAM = MAPL_AddChild(GC, NAME= 'MAM', SS=MAM_SetServices, __RC__)
if (myState%enable_MAMdata ) MAMdata = MAPL_AddChild(GC, NAME= 'MAM.data', SS=MAM_SetServices, __RC__)
if (myState%enable_TR ) TR = MAPL_AddChild(GC, NAME= 'TR', SS=TR_SetServices, __RC__)
if (myState%enable_DNA ) DNA = MAPL_AddChild(GC, NAME= 'DNA', SS=DNA_SetServices, __RC__)


! A container for the friendly tracers
Expand Down Expand Up @@ -324,6 +325,7 @@ subroutine SetServices ( GC, RC )

IF(MAPL_AM_I_ROOT()) THEN
PRINT *," "
PRINT *, TRIM(Iam)//": strict_child_timing =", myState%strict_child_timing
PRINT *, TRIM(Iam)//": RATs Provider List"
DO i = 1, numRATs
PRINT *," "//TRIM(speciesName(i))//": "//TRIM(RATsProviderName(i))
Expand Down

0 comments on commit 63ff970

Please sign in to comment.