Merge pull request #1408 from GRIDAPPSD/releases/2020.11.0

Release of version 2020.11.0

Dockerfile

@@ -48,19 +48,6 @@ RUN cd ${TEMP_DIR} \
   && cp -r * /gridappsd/services/gridappsd-alarms \
   && cp /gridappsd/services/gridappsd-alarms/gridappsd-alarms.config /gridappsd/services/ 
 
-# Get the gridappsd-estimator from the proper repository
-RUN cd ${TEMP_DIR} \
-  && git clone https://github.com/GRIDAPPSD/gridappsd-state-estimator \
-  && cd gridappsd-state-estimator \
-  && git clone https://github.com/GRIDAPPSD/SuiteSparse \
-  && git clone https://github.com/GRIDAPPSD/json \
-  && make -C SuiteSparse LAPACK=-llapack BLAS=-lblas \
-  && make -C state-estimator \
-  && mkdir -p /gridappsd/services/gridappsd-state-estimator \
-  && rm -rf .git SuiteSparse/.git json.git \ 
-  && cp -r * /gridappsd/services/gridappsd-state-estimator \
-  && cp /gridappsd/services/gridappsd-state-estimator/state-estimator.config /gridappsd/services/ 
-
 # Copy initial applications and services into the container.
 # 
 # NOTE: developers should mount a volume over the top of these or

gov.pnnl.goss.gridappsd/src/gov/pnnl/goss/gridappsd/configuration/GLDAllConfigurationHandler.java

@@ -261,10 +261,12 @@ public void generateConfig(Properties parameters, PrintWriter out, String proces
 				//TODO either we need more weather data in the database, or make this more flexible where we only have to search by month/day
 				c.setTime(new Date(simulationStartTime*1000));
 				c.set(Calendar.YEAR, TIMEFILTER_YEAR);
+				c.add(Calendar.MINUTE, -1);
 				//Convert to UTC time until the input time is correct
 				////TODO this will be changed in the future
 				//c.add(Calendar.HOUR, 6);
 				queryFilter.put(STARTTIME_FILTER, ""+c.getTimeInMillis()+"000000");
+				simulationDuration = simulationDuration+60;
 				c.add(Calendar.SECOND, new Long(simulationDuration).intValue());
 				queryFilter.put(ENDTIME_FILTER, ""+c.getTimeInMillis()+"000000");
 				weatherRequest.setQueryFilter(queryFilter);