Skip to content

[PULL REQUEST] Add co2 run #582

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lizziel merged 18 commits into from
Apr 7, 2021
Merged

[PULL REQUEST] Add co2 run #582

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
7515c06
Added base files for CO2 simulation type
Oct 13, 2020
e6e2ebd
Forward and reverse models compile and run
Dec 4, 2020
83d328c
Updated create run directory to reflect adjoint needs
Dec 7, 2020
cd488b8
Merge pull request #1 from TerribleNews/origin/add_co2_run
TerribleNews Dec 7, 2020
8086fe4
Merge pull request #2 from geoschem/main
TerribleNews Dec 12, 2020
a9f305e
Added base files for CO2 simulation type
Oct 13, 2020
2f675c7
Forward and reverse models compile and run
Dec 4, 2020
f358e6a
Updated create run directory to reflect adjoint needs
Dec 7, 2020
3502d06
Fixed compile errors in adjoint code
Jan 4, 2021
a62f440
Merge branch 'add_co2_run' of github.com:TerribleNews/geos-chem into …
Jan 4, 2021
32c723f
Moved adjoint code into #ifdef blocks
Jan 4, 2021
81a3a0e
Fixed errors in CO2 files.
Mar 8, 2021
5891c0a
Updated runscripts MPI configuration to match runConfig.sh
Mar 30, 2021
b1076ea
Responses to Lizzie's github pull request feedback
Apr 3, 2021
d298d16
Fixed merge conflict in mixing_mod
Apr 6, 2021
4c0a282
Undo changes to common run files, update input.geos.CO2
Apr 6, 2021
48919c2
Removed conditions causing GCC to fail
Apr 7, 2021
e34e0eb
Merge branch 'dev' into add_co2_run
lizziel Apr 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ endif()
#-----------------------------------------------------------------------------
# Print header
#-----------------------------------------------------------------------------
get_repo_version(GC_REPO_VERSION ${CMAKE_CURRENT_SOURCE_DIR})
# get_repo_version(GC_REPO_VERSION ${CMAKE_CURRENT_SOURCE_DIR})

@lizziel lizziel Apr 2, 2021

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you need this commented out?

@TerribleNews TerribleNews Apr 2, 2021 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, yes. I commented this out because if I don't, I get:

CMake Error at src/GCHP_GridComp/GEOSChem_GridComp/geos-chem/CMakeLists.txt:20 (get_repo_version):
  Unknown CMake command "get_repo_version".

when I run cmake

@TerribleNews TerribleNews Apr 2, 2021

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@LiamBindle has helped me fix this so it's uncommented plus the lines that include the library to avoid the error

message("=================================================================")
message("GEOS-Chem ${PROJECT_VERSION} (science codebase)")
message("Current status: ${GC_REPO_VERSION}")
Expand Down
158 changes: 158 additions & 0 deletions GeosCore/diagnostics_mod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ MODULE Diagnostics_mod
PUBLIC :: Set_Diagnostics_EndofTimestep
PUBLIC :: Zero_Diagnostics_StartofTimestep
PUBLIC :: Compute_Budget_Diagnostics
#ifdef ADJOINT
PUBLIC :: Set_SpcAdj_Diagnostic
#endif
!
! !PRIVATE MEMBER FUNCTIONS
!
Expand Down Expand Up @@ -125,6 +128,25 @@ SUBROUTINE Set_Diagnostics_EndofTimestep( Input_Opt, State_Chm, State_Diag, &
RETURN
ENDIF

#ifdef ADJOINT
!-----------------------------------------------------------------------
! Set species concentration diagnostic in units specified in state_diag_mod
!-----------------------------------------------------------------------
IF ( State_Diag%Archive_SpeciesAdj ) THEN
if (Input_Opt%IS_FD_SPOT_THIS_PET) THEN
write(*,*) 'Before diagnostic ', &
State_Chm%SpeciesAdj(Input_Opt%IFD,Input_Opt%JFD,Input_Opt%LFD,Input_opt%NFD)
ENDIF
CALL Set_SpcAdj_Diagnostic( Input_Opt, State_Chm, State_Diag, &
State_Grid, State_Met, RC )

! Trap potential errors
IF ( RC /= GC_SUCCESS ) THEN
ErrMsg = 'Error encountered setting species adoint diagnostic'
CALL GC_ERROR( ErrMsg, RC, ThisLoc )
ENDIF
ENDIF
#endif
!-----------------------------------------------------------------------
! Set total dry deposition flux
!-----------------------------------------------------------------------
Expand Down Expand Up @@ -312,6 +334,142 @@ SUBROUTINE Zero_Diagnostics_StartofTimestep( Input_Opt, State_Diag, RC )

END SUBROUTINE Zero_Diagnostics_StartofTimestep
!EOC
#ifdef ADJOINT
!------------------------------------------------------------------------------
! GEOS-Chem Global Chemical Transport Model !
!------------------------------------------------------------------------------
!BOP
!
! !IROUTINE: Set_SpcAdj_Diagnostic
!
! !DESCRIPTION: Subroutine Set_SpcAdj\_Diagnostic sets the passed species
! adjoint diagnostic array stored in State_Diag to the instantaneous
! State_Chm%SpeciesAdj values converted to the diagnostic unit stored in
! the State_Diag metadata.
!\\
!\\
! !INTERFACE:
!
SUBROUTINE Set_SpcAdj_Diagnostic( Input_Opt, State_Chm, State_Diag, &
State_Grid, State_Met, RC )
!
! !USES:
!
USE Input_Opt_Mod, ONLY : OptInput
USE State_Met_Mod, ONLY : MetState
USE State_Chm_Mod, ONLY : ChmState
USE State_Diag_Mod, ONLY : DgnMap
USE State_Diag_Mod, ONLY : DgnState
USE State_Grid_Mod, ONLY : GrdState
USE UnitConv_Mod, ONLY : Convert_Spc_Units
!
! !INPUT PARAMETERS:
!
TYPE(OptInput), INTENT(IN) :: Input_Opt ! Input Options object
TYPE(GrdState), INTENT(IN) :: State_Grid ! Grid state object
TYPE(MetState), INTENT(IN) :: State_Met ! Meteorology state object
!
! !INPUT/OUTPUT PARAMETERS:
!
TYPE(ChmState), INTENT(INOUT) :: State_Chm ! Chemistry State object
TYPE(DgnState), INTENT(INOUT) :: State_Diag ! Diagnostics State object
!
! !OUTPUT PARAMETERS:
!
INTEGER, INTENT(OUT) :: RC ! Success or failure?
!
! !REMARKS:
!
! !REVISION HISTORY:
! 15 Dec 2019 - C. Lee - Initial version
! 17 Dec 2020 - C. Lee - Updated to account for changes to Set_SpcConcs
!EOP
!------------------------------------------------------------------------------
!BOC
!
! !LOCAL VARIABLES:
!
! Scalars
LOGICAL :: Found
INTEGER :: D, I, J, L, N, S
REAL(fp) :: TmpVal, Conv

! Strings
CHARACTER(LEN=255) :: ErrMsg, ThisLoc, Units, OrigUnit

! Objects
TYPE(DgnMap), POINTER :: mapData

! Arrays
REAL(fp) :: TmpSpcArr(State_Grid%NX,State_Grid%NY, &
State_Grid%NZ,State_Chm%nSpecies)

!====================================================================
! Set_SpcAdj_Diagnostic begins here!
!====================================================================

! Assume success
RC = GC_SUCCESS
Found = .FALSE.
ThisLoc = ' -> Set_SpcAdj_Diagnostic (in GeosCore/diagnostics_mod.F90)'


! Verify that incoming State_Chm%Species units are kg/kg dry air.
IF ( TRIM( State_Chm%Spc_Units ) /= 'kg/kg dry' ) THEN
ErrMsg = 'Incorrect species units in Set_SpcConc_Diags_VVDry!'
CALL GC_Error( ErrMsg, RC, ThisLoc )
RETURN
ENDIF

!$OMP PARALLEL DO &
!$OMP DEFAULT( SHARED ) &
!$OMP PRIVATE( I, J, L, N )
DO N = 1, State_Chm%nSpecies
DO L = 1, State_Grid%NZ
DO J = 1, State_Grid%NY
DO I = 1, State_Grid%NX
! Forward code
! TmpSpcArr(I,J,L,N) = State_Chm%Species(I,J,L,N) * &
! ( AIRMW / State_Chm%SpcData(N)%Info%MW_g )
TmpSpcArr(I,J,L,N) = State_Chm%SpeciesAdj(I,J,L,N)
ENDDO
ENDDO
ENDDO
ENDDO
!$OMP END PARALLEL DO

!=======================================================================
! Copy species to SpeciesConc (concentrations diagnostic) [v/v dry]
!=======================================================================
IF ( Input_Opt%Is_Adjoint ) THEN

! Point to mapping obj specific to SpeciesConc diagnostic collection
mapData => State_Diag%Map_SpeciesConc

!$OMP PARALLEL DO &
!$OMP DEFAULT( SHARED ) &
!$OMP PRIVATE( N, S )
DO S = 1, mapData%nSlots
N = mapData%slot2id(S)
State_Diag%SpeciesAdj(:,:,:,S) = TmpSpcArr(:,:,:,N)
ENDDO
!$OMP END PARALLEL DO

! Free pointer
mapData => NULL()

ENDIF

! Error handling
IF ( RC /= GC_SUCCESS ) THEN
ErrMsg = 'Error converting species units for archiving diagnostics #2'
CALL GC_Error( ErrMsg, RC, ThisLoc )
RETURN
ENDIF

END SUBROUTINE Set_SpcAdj_Diagnostic
!EOC
#endif
!------------------------------------------------------------------------------
! GEOS-Chem Global Chemical Transport Model !
!------------------------------------------------------------------------------
Expand Down
18 changes: 17 additions & 1 deletion GeosCore/hco_interface_gc_mod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,10 +423,25 @@ SUBROUTINE HCOI_GC_Init( Input_Opt, State_Chm, State_Grid, &
! Set misc. parameter
!=======================================================================

#ifdef ADJOINT
if ( Input_Opt%amIRoot ) WRITE(*,*) 'Setting isAdjoint to ', Input_Opt%is_adjoint
HcoState%isAdjoint = Input_opt%is_adjoint
! if ( .not. HcoState%isAdjoint ) THEN
#endif
! Emission, chemistry and dynamics timestep in seconds
HcoState%TS_EMIS = GET_TS_EMIS()
HcoState%TS_CHEM = GET_TS_CHEM()
HcoState%TS_DYN = GET_TS_DYN()
! #ifdef ADJOINT
! else
! ! Emission, chemistry and dynamics timestep in seconds
! HcoState%TS_EMIS = -GET_TS_EMIS()
! HcoState%TS_CHEM = -GET_TS_CHEM()
! HcoState%TS_DYN = -GET_TS_DYN()
! ! Look into whether we want to change the sign in the body of GET_TS_*()
! endif
! #endif

@lizziel lizziel Apr 2, 2021

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Keep this even though it is commented out?


! Is this an ESMF simulation or not?
! The ESMF flag must be set before calling HCO_Init because the
Expand Down Expand Up @@ -1180,6 +1195,7 @@ SUBROUTINE HCOI_GC_WriteDiagn( Input_Opt, Restart, RC )

USE Time_Mod, ONLY : Get_Year, Get_Month, Get_Day, GET_DAY_OF_YEAR
USE Time_Mod, ONLY : GET_HOUR, GET_MINUTE, GET_SECOND
USE MAPL_CommsMod, ONLY : MAPL_AM_I_ROOT

@lizziel lizziel Apr 2, 2021

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will need to be in a MAPL ifdef so that GC-Classic does not execute it

!
! !INPUT/OUTPUT PARAMETERS:
!
Expand Down Expand Up @@ -1252,7 +1268,7 @@ SUBROUTINE HCOI_GC_WriteDiagn( Input_Opt, Restart, RC )
! Write diagnostics
!-----------------------------------------------------------------------
CALL HcoDiagn_Write( HcoState, RESTART, HMRC )

IF ( Mapl_am_i_root() ) WRITE(*,*) "Back from HcoDiagn_Write, RC = ", HMRC
! Trap potential errors
IF ( HMRC /= HCO_SUCCESS ) THEN
RC = HMRC
Expand Down
13 changes: 13 additions & 0 deletions GeosCore/input_mod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5600,6 +5600,19 @@ SUBROUTINE CHECK_TIME_STEPS( Input_Opt, State_Grid, RC)
TS_DYN = Input_Opt%TS_DYN
TS_RAD = Input_Opt%TS_RAD

! If we're doing the reverse integration
! multiply all the timesteps by -1 here
if (TS_DYN < 0) THEN
! TS_DYN and TS_CHEM should always be set to something valid...?
TS_DYN = TS_DYN * -1
TS_CHEM = TS_CHEM * -1
if (LTURB .or. LCONV) TS_CONV = TS_CONV * -1
if (LEMIS .or. LDRYD) TS_EMIS = TS_EMIS * -1
! I'm not sure which flag determins radiation on/off?
if (LCHEM) TS_RAD = TS_RAD * -1
endif


@lizziel lizziel Apr 7, 2021

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For GC-Classic to build and run I needed to change this section to this:

    ! If we're doing the reverse integration                                              
    ! multiply all the timesteps by -1 here                                               
    IF ( TS_DYN < 0 ) THEN
       TS_CHEM = TS_CHEM * -1
       TS_EMIS = TS_EMIS * -1
       TS_CONV = TS_CONV * -1
       TS_DYN  = TS_DYN  * -1
       TS_RAD  = TS_RAD  * -1
    ENDIF

@lizziel lizziel Apr 7, 2021

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Otherwise this looks good to go. If you could just push the update I will go ahead and merge. Thanks for your work on this!

! NUNIT is time step in minutes for unit conversion
TS_UNIT = -1

Expand Down
Loading