diff --git a/CMakeLists.txt b/CMakeLists.txt index 5e1bc3899cd9..0a3bce9e8440 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_policy (SET CMP0054 NEW) project ( MAPL - VERSION 1.1.1 + VERSION 1.1.8 LANGUAGES Fortran CXX C) # Note - CXX is required for ESMF if (NOT COMMAND esma) # build as standalone project diff --git a/MAPL_Base/MAPL_sun_uc.F90 b/MAPL_Base/MAPL_sun_uc.F90 index 49ed6241b977..4b30c3352683 100644 --- a/MAPL_Base/MAPL_sun_uc.F90 +++ b/MAPL_Base/MAPL_sun_uc.F90 @@ -459,7 +459,7 @@ end subroutine MAPL_SunOrbitQuery #define DIMENSIONS (:) #define THE_SIZE (size(LONS,1)) recursive subroutine SOLAR_1D(LONS, LATS, ORBIT,ZTH,SLR,INTV,CLOCK, & - TIME,currTime,DIST,ZTHB,ZTHD,ZTH1,ZTHN,RC) + TIME,currTime,DIST,ZTHB,ZTHD,ZTH1,ZTHN,STEPSIZE,RC) #include "sun.H" end subroutine SOLAR_1D @@ -470,7 +470,7 @@ end subroutine SOLAR_1D #define DIMENSIONS (:,:) #define THE_SIZE (size(LONS,1),size(LONS,2)) recursive subroutine SOLAR_2D(LONS, LATS, ORBIT,ZTH,SLR,INTV,CLOCK, & - TIME,currTime,DIST,ZTHB,ZTHD,ZTH1,ZTHN,RC) + TIME,currTime,DIST,ZTHB,ZTHD,ZTH1,ZTHN,STEPSIZE,RC) #include "sun.H" end subroutine SOLAR_2D #undef DIMENSIONS diff --git a/MAPL_Base/sun.H b/MAPL_Base/sun.H index cf6ffa37f415..d49ee0e1ff97 100644 --- a/MAPL_Base/sun.H +++ b/MAPL_Base/sun.H @@ -15,6 +15,7 @@ real, optional, intent(OUT) :: ZTHD DIMENSIONS real, optional, intent(OUT) :: ZTH1 DIMENSIONS real, optional, intent(OUT) :: ZTHN DIMENSIONS + real, optional, intent(IN) :: STEPSIZE integer, optional, intent(OUT) :: RC ! Locals @@ -177,8 +178,10 @@ call ESMF_TimeIntervalGet (INTV, S_R8=SECS, rc=STATUS) VERIFY_(STATUS) - - if(SECS>1500.) then + + if(present(STEPSIZE)) then ! interval for integration + NT = nint(SECS/STEPSIZE) + else if(SECS>1500.) then NT = nint(SECS/300.0) else NT = 5