From c35280cc9ff1cc8ae58e95452b92b4f0056d8969 Mon Sep 17 00:00:00 2001 From: Melissa Sulprizio Date: Thu, 11 Dec 2014 15:19:35 -0500 Subject: [PATCH] Minor fixes for GEOS-FP lightning scaling factors Betty Croft wrote: We would need something like the following in case it was 2013. I added & ( GET_YEAR() .eq. 2013 ) .or. in the below code in order to calculate BETA in 2013. ! Constrained with simulated "climatology" for ! April 2012 - Oct 2014. Will need to be updated as more ! met fields become available (ltm, 11/07/13). IF ( ( GET_YEAR() .eq. 2012 .and. GET_MONTH() .ge. 4 ) .or. & ( GET_YEAR() .eq. 2013 ) .or. & ( GET_YEAR() .eq. 2014 .and. GET_MONTH() .le. 10 ) ) THEN BETA = ANN_AVG_FLASHRATE / 82.373293d0 ENDIF Signed-off-by: Melissa Sulprizio --- GeosCore/lightning_nox_mod.F | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/GeosCore/lightning_nox_mod.F b/GeosCore/lightning_nox_mod.F index 7cb8cd5..dde10d8 100644 --- a/GeosCore/lightning_nox_mod.F +++ b/GeosCore/lightning_nox_mod.F @@ -1323,7 +1323,7 @@ ! This file constrains lightning distribution from Apr. 2012-Oct. 2014 ! (ltm, 12/10/2014) #if defined( GEOS_FP ) - FILENAME = TRIM( FILENAME ) // '.v20121210' + FILENAME = TRIM( FILENAME ) // '.v20141210' #endif ! Append suffix for GEOS-5 nested grids @@ -1576,7 +1576,8 @@ ! Constrained with simulated "climatology" for ! April 2012 - Oct 2014. Will need to be updated as more ! met fields become available (ltm, 12/10/14). - IF ( ( GET_YEAR() .eq. 2012 .and. GET_MONTH() .ge. 4 ) .or. + IF ( ( GET_YEAR() .eq. 2012 .and. GET_MONTH() .ge. 4 ) .or. + & ( GET_YEAR() .eq. 2013 ) .or. & ( GET_YEAR() .eq. 2014 .and. GET_MONTH() .le. 10 ) ) THEN BETA = ANN_AVG_FLASHRATE / 82.373293d0 ENDIF @@ -1590,7 +1591,8 @@ ! Constrained with simulated "climatology" for ! April 2012 - Oct 2014. Will need to be updated as more ! met fields become available (ltm, 12/10/14). - IF ( ( GET_YEAR() .eq. 2012 .and. GET_MONTH() .ge. 4 ) .or. + IF ( ( GET_YEAR() .eq. 2012 .and. GET_MONTH() .ge. 4 ) .or. + & ( GET_YEAR() .eq. 2013 ) .or. & ( GET_YEAR() .eq. 2014 .and. GET_MONTH() .le. 10 ) ) THEN BETA = ANN_AVG_FLASHRATE / 260.40253d0 ENDIF @@ -1612,8 +1614,9 @@ ! Constrained with simulated "climatology" for ! April 2012 - May 2014. Will need to be updated as more ! met fields become available (ltm, 07/23/14). - IF ( ( GET_YEAR() .eq. 2012 .and. GET_MONTH() .ge. 4 ) .or. - & ( GET_YEAR() .eq. 2014 .and. GET_MONTH() .le. 5 ) ) THEN + IF ( ( GET_YEAR() .eq. 2012 .and. GET_MONTH() .ge. 4 ) .or. + & ( GET_YEAR() .eq. 2013 ) .or. + & ( GET_YEAR() .eq. 2014 .and. GET_MONTH() .le. 10 ) ) THEN BETA = ANN_AVG_FLASHRATE / 689.68452d0 ENDIF -- 1.9.3