diff --git a/SRC/analysis/analysis/ResponseSpectrumAnalysis.cpp b/SRC/analysis/analysis/ResponseSpectrumAnalysis.cpp
index 80bcc35c90..bffcea70f4 100644
--- a/SRC/analysis/analysis/ResponseSpectrumAnalysis.cpp
+++ b/SRC/analysis/analysis/ResponseSpectrumAnalysis.cpp
@@ -170,7 +170,7 @@ OPS_ResponseSpectrumAnalysis(void)
 	// get time series
 	if (!use_lists) {
 		int tstag;
-		if (OPS_GetInt(&numData, &tstag) < 0) {
+		if (OPS_GetIntInput(&numData, &tstag) < 0) {
 			opserr << "ResponseSpectrumAnalysis Error: Failed to get timeSeries tag.\n";
 			return -1;
 		}
@@ -182,7 +182,7 @@ OPS_ResponseSpectrumAnalysis(void)
 	}
 
 	// get direction
-	if (OPS_GetInt(&numData, &dir) < 0) {
+	if (OPS_GetIntInput(&numData, &dir) < 0) {
 		opserr << "ResponseSpectrumAnalysis Error: Failed to get direction.\n";
 		return -1;
 	}
@@ -196,7 +196,7 @@ OPS_ResponseSpectrumAnalysis(void)
 		const char* value = OPS_GetString();
 		if (strcmp(value, "-scale") == 0) {
 			if (OPS_GetNumRemainingInputArgs() > 0) {
-				if (OPS_GetDouble(&numData, &scale) < 0) {
+				if (OPS_GetDoubleInput(&numData, &scale) < 0) {
 					opserr << "ResponseSpectrumAnalysis Error: Failed to get scale factor.\n";
 					return -1;
 				}
@@ -208,7 +208,7 @@ OPS_ResponseSpectrumAnalysis(void)
 		}
 		else if (strcmp(value, "-mode") == 0) {
 			if (OPS_GetNumRemainingInputArgs() > 0) {
-				if (OPS_GetInt(&numData, &mode_id) < 0) {
+				if (OPS_GetIntInput(&numData, &mode_id) < 0) {
 					opserr << "ResponseSpectrumAnalysis Error: Failed to get the mode_id.\n";
 					return -1;
 				}
diff --git a/SRC/analysis/analysis/SDFAnalysis.cpp b/SRC/analysis/analysis/SDFAnalysis.cpp
index e8d58e2601..6f7869d315 100644
--- a/SRC/analysis/analysis/SDFAnalysis.cpp
+++ b/SRC/analysis/analysis/SDFAnalysis.cpp
@@ -169,7 +169,7 @@ int OPS_sdfResponse()
     double amax = 0.0; double tamax = 0.0;
     double up = uresidual; double up0 = up;
     int i = 0;
-    double ft, u=0, du, v, a, fs, zs, ftrial, kT, kTeff, dg, phat, R, R0, accel;
+    double ft, u=0, du, v, a, fs, zs, ftrial, kT, kTeff, dg, phat, R, R0;
     double time = accelSeries->getStartTime();
     double Tend = accelSeries->getDuration();
     while (time < Tend) {
diff --git a/SRC/analysis/integrator/AlphaOS.cpp b/SRC/analysis/integrator/AlphaOS.cpp
index 7be93ceef5..b4ed6bbe1a 100644
--- a/SRC/analysis/integrator/AlphaOS.cpp
+++ b/SRC/analysis/integrator/AlphaOS.cpp
@@ -63,7 +63,7 @@ void *    OPS_AlphaOS(void)
     else
         numData = 3;
     
-    if (OPS_GetDouble(&numData, dData) != 0) {
+    if (OPS_GetDoubleInput(&numData, dData) != 0) {
         opserr << "WARNING - invalid args want AlphaOS $alpha <-updateElemDisp>\n";
         opserr << "          or AlphaOS $alpha $beta $gamma <-updateElemDisp>\n";
         return 0;
diff --git a/SRC/analysis/integrator/AlphaOSGeneralized.cpp b/SRC/analysis/integrator/AlphaOSGeneralized.cpp
index 47c755e37c..4d1d93b700 100644
--- a/SRC/analysis/integrator/AlphaOSGeneralized.cpp
+++ b/SRC/analysis/integrator/AlphaOSGeneralized.cpp
@@ -63,7 +63,7 @@ void *    OPS_AlphaOSGeneralized(void)
     else
         numData = 4;
     
-    if (OPS_GetDouble(&numData, dData) != 0) {
+    if (OPS_GetDoubleInput(&numData, dData) != 0) {
         opserr << "WARNING - invalid args want AlphaOSGeneralized $alpha <-updateElemDisp>\n";
         opserr << "          or AlphaOSGeneralized $alphaI $alphaF $beta $gamma <-updateElemDisp>\n";
         return 0;
diff --git a/SRC/analysis/integrator/AlphaOSGeneralized_TP.cpp b/SRC/analysis/integrator/AlphaOSGeneralized_TP.cpp
index 96ff884cda..58709f840a 100644
--- a/SRC/analysis/integrator/AlphaOSGeneralized_TP.cpp
+++ b/SRC/analysis/integrator/AlphaOSGeneralized_TP.cpp
@@ -63,7 +63,7 @@ void *    OPS_AlphaOSGeneralized_TP(void)
     else
         numData = 4;
     
-    if (OPS_GetDouble(&numData, dData) != 0) {
+    if (OPS_GetDoubleInput(&numData, dData) != 0) {
         opserr << "WARNING - invalid args want AlphaOSGeneralized_TP $alpha <-updateElemDisp>\n";
         opserr << "          or AlphaOSGeneralized_TP $alphaI $alphaF $beta $gamma <-updateElemDisp>\n";
         return 0;
diff --git a/SRC/analysis/integrator/AlphaOS_TP.cpp b/SRC/analysis/integrator/AlphaOS_TP.cpp
index fcecdbe787..cde8489b38 100644
--- a/SRC/analysis/integrator/AlphaOS_TP.cpp
+++ b/SRC/analysis/integrator/AlphaOS_TP.cpp
@@ -63,7 +63,7 @@ void *    OPS_AlphaOS_TP(void)
     else
         numData = 3;
     
-    if (OPS_GetDouble(&numData, dData) != 0) {
+    if (OPS_GetDoubleInput(&numData, dData) != 0) {
         opserr << "WARNING - invalid args want AlphaOS_TP $alpha <-updateElemDisp>\n";
         opserr << "          or AlphaOS_TP $alpha $beta $gamma <-updateElemDisp>\n";
         return 0;
diff --git a/SRC/analysis/integrator/ArcLength.cpp b/SRC/analysis/integrator/ArcLength.cpp
index 7e11dc3a84..fdcf9641ec 100644
--- a/SRC/analysis/integrator/ArcLength.cpp
+++ b/SRC/analysis/integrator/ArcLength.cpp
@@ -543,7 +543,7 @@ ArcLength::recvSelf(int cTag,
   alpha2 = data(1);
   deltaLambdaStep = data(2);
   currentLambda = data(3);
-  signLastDeltaLambdaStep = data(4);
+  signLastDeltaLambdaStep = (int)data(4);
  // opserr<<"recSelf: end"<<endln;
 
   return 0;
diff --git a/SRC/analysis/integrator/ArcLength1.cpp b/SRC/analysis/integrator/ArcLength1.cpp
index 71e80ad272..ac5779b742 100644
--- a/SRC/analysis/integrator/ArcLength1.cpp
+++ b/SRC/analysis/integrator/ArcLength1.cpp
@@ -312,7 +312,7 @@ ArcLength1::recvSelf(int cTag,
   alpha2 = data(1);
   deltaLambdaStep = data(2);
   currentLambda = data(3);
-  signLastDeltaLambdaStep = data(4);
+  signLastDeltaLambdaStep = (int)data(4);
   return 0;
 }
 
diff --git a/SRC/analysis/integrator/Collocation.cpp b/SRC/analysis/integrator/Collocation.cpp
index bc9a6df17c..93d8ccaec4 100644
--- a/SRC/analysis/integrator/Collocation.cpp
+++ b/SRC/analysis/integrator/Collocation.cpp
@@ -57,7 +57,7 @@ void *    OPS_Collocation(void)
     }
     
     double dData[3];
-    if (OPS_GetDouble(&argc, dData) != 0) {
+    if (OPS_GetDoubleInput(&argc, dData) != 0) {
         opserr << "WARNING - invalid args want Collocation $theta\n";
         opserr << "          or Collocation $theta $beta $gamma\n";
         return 0;
diff --git a/SRC/analysis/integrator/CollocationHSFixedNumIter.cpp b/SRC/analysis/integrator/CollocationHSFixedNumIter.cpp
index e99bea5381..e6fd5d3aac 100755
--- a/SRC/analysis/integrator/CollocationHSFixedNumIter.cpp
+++ b/SRC/analysis/integrator/CollocationHSFixedNumIter.cpp
@@ -72,7 +72,7 @@ void *    OPS_CollocationHSFixedNumIter(void)
     // reset to read from beginning
     OPS_ResetCurrentInputArg(2);
     
-    if (OPS_GetDouble(&numData, dData) != 0) {
+    if (OPS_GetDoubleInput(&numData, dData) != 0) {
         opserr << "WARNING - invalid args want CollocationHSFixedNumIter $theta <-polyOrder $O>\n";
         opserr << "          or CollocationHSFixedNumIter $theta $beta $gamma <-polyOrder $O>\n";
         return 0;
@@ -82,7 +82,7 @@ void *    OPS_CollocationHSFixedNumIter(void)
         const char *argvLoc = OPS_GetString();
         if (strcmp(argvLoc, "-polyOrder") == 0) {
             int numData2 = 1;
-            if (OPS_GetInt(&numData2, &polyOrder) != 0) {
+            if (OPS_GetIntInput(&numData2, &polyOrder) != 0) {
                 opserr << "WARNING - invalid polyOrder want CollocationHSFixedNumIter $rhoInf <-polyOrder $O>\n";
                 opserr << "          or CollocationHSFixedNumIter $alphaI $alphaF $beta $gamma <-polyOrder $O>\n";
             }
diff --git a/SRC/analysis/integrator/CollocationHSIncrLimit.cpp b/SRC/analysis/integrator/CollocationHSIncrLimit.cpp
index dbdefab8b5..57427ae1cd 100644
--- a/SRC/analysis/integrator/CollocationHSIncrLimit.cpp
+++ b/SRC/analysis/integrator/CollocationHSIncrLimit.cpp
@@ -71,7 +71,7 @@ void *    OPS_CollocationHSIncrLimit(void)
     // reset to read from beginning
     OPS_ResetCurrentInputArg(2);
     
-    if (OPS_GetDouble(&numData, dData) != 0) {
+    if (OPS_GetDoubleInput(&numData, dData) != 0) {
         opserr << "WARNING - invalid args want CollocationHSIncrLimit $theta $limit <-normType $T>\n";
         opserr << "          or CollocationHSIncrLimit $theta $beta $gamma $limit <-normType $T>\n";
         return 0;
@@ -81,7 +81,7 @@ void *    OPS_CollocationHSIncrLimit(void)
         const char *argvLoc = OPS_GetString();
         if (strcmp(argvLoc, "-normType") == 0) {
             int numData2 = 1;
-            if (OPS_GetInt(&numData2, &normType) != 0) {
+            if (OPS_GetIntInput(&numData2, &normType) != 0) {
                 opserr << "WARNING - invalid normType want CollocationHSIncrLimit $theta $limit <-normType $T>\n";
                 opserr << "          or CollocationHSIncrLimit $theta $beta $gamma $limit <-normType $T>\n";
             }
diff --git a/SRC/analysis/integrator/CollocationHSIncrReduct.cpp b/SRC/analysis/integrator/CollocationHSIncrReduct.cpp
index 98bd91fb6b..ed4a6014c3 100755
--- a/SRC/analysis/integrator/CollocationHSIncrReduct.cpp
+++ b/SRC/analysis/integrator/CollocationHSIncrReduct.cpp
@@ -57,7 +57,7 @@ void *    OPS_CollocationHSIncrReduct(void)
     }
     
     double dData[4];
-    if (OPS_GetDouble(&argc, dData) != 0) {
+    if (OPS_GetDoubleInput(&argc, dData) != 0) {
         opserr << "WARNING - invalid args want CollocationHSIncrReduct $theta $reduct\n";
         opserr << "          or CollocationHSIncrReduct $theta $beta $gamma $reduct\n";
         return 0;
diff --git a/SRC/analysis/integrator/GeneralizedAlpha.cpp b/SRC/analysis/integrator/GeneralizedAlpha.cpp
index a051f49026..0565bf440f 100644
--- a/SRC/analysis/integrator/GeneralizedAlpha.cpp
+++ b/SRC/analysis/integrator/GeneralizedAlpha.cpp
@@ -56,7 +56,7 @@ void *OPS_GeneralizedAlpha(void)
   }
 
   double dData[4];
-  if (OPS_GetDouble(&argc, dData) != 0) {
+  if (OPS_GetDoubleInput(&argc, dData) != 0) {
     opserr << "WARNING - invalid args want GeneralizedAlpha $alphaM $alphaF <$gamma $beta>\n";
     return 0;
   }
diff --git a/SRC/analysis/integrator/GimmeMCK.cpp b/SRC/analysis/integrator/GimmeMCK.cpp
index 6e0fc18628..5445f65f21 100644
--- a/SRC/analysis/integrator/GimmeMCK.cpp
+++ b/SRC/analysis/integrator/GimmeMCK.cpp
@@ -56,14 +56,14 @@ void*  OPS_GimmeMCK(void)
 
     int numdata = 3;
     double ddata[3];    
-    if (OPS_GetDouble(&numdata, ddata) != 0) {
+    if (OPS_GetDoubleInput(&numdata, ddata) != 0) {
         opserr << "WARNING - invalid args want GimmeMCK $m $c $k <$ki>\n";
         return 0;
     }
     numdata = 1;
     double ki = 0.0;
     if (argc > 3) {
-      if (OPS_GetDouble(&numdata, &ki) != 0) {
+      if (OPS_GetDoubleInput(&numdata, &ki) != 0) {
         opserr << "WARNING - invalid args want GimmeMCK $m $c $k <$ki>\n";
         return 0;
       }
diff --git a/SRC/analysis/integrator/HHT.cpp b/SRC/analysis/integrator/HHT.cpp
index 70a7eff901..3ae2b39d08 100644
--- a/SRC/analysis/integrator/HHT.cpp
+++ b/SRC/analysis/integrator/HHT.cpp
@@ -56,7 +56,7 @@ OPS_HHT(void)
     }
     
     double dData[3];
-    if (OPS_GetDouble(&argc, dData) != 0) {
+    if (OPS_GetDoubleInput(&argc, dData) != 0) {
         opserr << "WARNING - invalid args want HHT $alpha <$gamma $beta>\n";
         return 0;
     }
diff --git a/SRC/analysis/integrator/HHTExplicit.cpp b/SRC/analysis/integrator/HHTExplicit.cpp
index 5b795d1ece..ba802c5eb2 100644
--- a/SRC/analysis/integrator/HHTExplicit.cpp
+++ b/SRC/analysis/integrator/HHTExplicit.cpp
@@ -70,7 +70,7 @@ void *    OPS_HHTExplicit(void)
     // reset to read from beginning
     OPS_ResetCurrentInputArg(2);
     
-    if (OPS_GetDouble(&numData, dData) != 0) {
+    if (OPS_GetDoubleInput(&numData, dData) != 0) {
         opserr << "WARNING - invalid args want HHTExplicit $alpha <-updateElemDisp>\n";
         opserr << "          or HHTExplicit $alpha $gamma <-updateElemDisp>\n";
         return 0;
diff --git a/SRC/analysis/integrator/HHTExplicit_TP.cpp b/SRC/analysis/integrator/HHTExplicit_TP.cpp
index d94d217d0c..42cebe5491 100644
--- a/SRC/analysis/integrator/HHTExplicit_TP.cpp
+++ b/SRC/analysis/integrator/HHTExplicit_TP.cpp
@@ -56,7 +56,7 @@ void *    OPS_HHTExplicit_TP(void)
     }
     
     double dData[2];
-    if (OPS_GetDouble(&argc, dData) != 0) {
+    if (OPS_GetDoubleInput(&argc, dData) != 0) {
         opserr << "WARNING - invalid args want HHTExplicit_TP $alpha\n";
         opserr << "          or HHTExplicit_TP $alpha $gamma\n";
         return 0;
diff --git a/SRC/analysis/integrator/HHTGeneralized.cpp b/SRC/analysis/integrator/HHTGeneralized.cpp
index 93750b6f1a..d80f745200 100644
--- a/SRC/analysis/integrator/HHTGeneralized.cpp
+++ b/SRC/analysis/integrator/HHTGeneralized.cpp
@@ -56,7 +56,7 @@ void *    OPS_HHTGeneralized(void)
     }
     
     double dData[4];
-    if (OPS_GetDouble(&argc, dData) != 0) {
+    if (OPS_GetDoubleInput(&argc, dData) != 0) {
         opserr << "WARNING - invalid args want HHTGeneralized $rhoInf\n";
         opserr << "          or HHTGeneralized $alphaI $alphaF $beta $gamma\n";
         return 0;
diff --git a/SRC/analysis/integrator/HHTGeneralizedExplicit.cpp b/SRC/analysis/integrator/HHTGeneralizedExplicit.cpp
index 8dd59a1482..82536dd6b7 100644
--- a/SRC/analysis/integrator/HHTGeneralizedExplicit.cpp
+++ b/SRC/analysis/integrator/HHTGeneralizedExplicit.cpp
@@ -64,7 +64,7 @@ void *    OPS_HHTGeneralizedExplicit(void)
     else
         numData = 4;
     
-    if (OPS_GetDouble(&numData, dData) != 0) {
+    if (OPS_GetDoubleInput(&numData, dData) != 0) {
         opserr << "WARNING - invalid args want HHTGeneralizedExplicit $rhoB $alphaF <-updateElemDisp>\n";
         opserr << "          or HHTGeneralizedExplicit $alphaI $alphaF $beta $gamma <-updateElemDisp>\n";
         return 0;
diff --git a/SRC/analysis/integrator/HHTGeneralizedExplicit_TP.cpp b/SRC/analysis/integrator/HHTGeneralizedExplicit_TP.cpp
index d449351c3a..d61271554d 100644
--- a/SRC/analysis/integrator/HHTGeneralizedExplicit_TP.cpp
+++ b/SRC/analysis/integrator/HHTGeneralizedExplicit_TP.cpp
@@ -57,7 +57,7 @@ void *    OPS_HHTGeneralizedExplicit_TP(void)
     }
     
     double dData[4];
-    if (OPS_GetDouble(&argc, dData) != 0) {
+    if (OPS_GetDoubleInput(&argc, dData) != 0) {
         opserr << "WARNING - invalid args want HHTGeneralizedExplicit_TP $rhoB $alphaF\n";
         opserr << "          or HHTGeneralizedExplicit_TP $alphaI $alphaF $beta $gamma\n";
         return 0;
diff --git a/SRC/analysis/integrator/HHTGeneralized_TP.cpp b/SRC/analysis/integrator/HHTGeneralized_TP.cpp
index 8e8372647c..8c3c0f56ee 100644
--- a/SRC/analysis/integrator/HHTGeneralized_TP.cpp
+++ b/SRC/analysis/integrator/HHTGeneralized_TP.cpp
@@ -56,7 +56,7 @@ void *    OPS_HHTGeneralized_TP(void)
     }
     
     double dData[4];
-    if (OPS_GetDouble(&argc, dData) != 0) {
+    if (OPS_GetDoubleInput(&argc, dData) != 0) {
         opserr << "WARNING - invalid args want HHTGeneralized_TP $rhoInf\n";
         opserr << "          or HHTGeneralized_TP $alphaI $alphaF $beta $gamma\n";
         return 0;
diff --git a/SRC/analysis/integrator/HHTHSFixedNumIter.cpp b/SRC/analysis/integrator/HHTHSFixedNumIter.cpp
index e448494f7a..70093eff86 100755
--- a/SRC/analysis/integrator/HHTHSFixedNumIter.cpp
+++ b/SRC/analysis/integrator/HHTHSFixedNumIter.cpp
@@ -65,7 +65,7 @@ void *    OPS_HHTHSFixedNumIter(void)
     else
         numData = 4;
     
-    if (OPS_GetDouble(&numData, dData) != 0) {
+    if (OPS_GetDoubleInput(&numData, dData) != 0) {
         opserr << "WARNING - invalid args want HHTHSFixedNumIter $rhoInf <-polyOrder $O>\n";
         opserr << "          or HHTHSFixedNumIter $alphaI $alphaF $beta $gamma <-polyOrder $O>\n";
         return 0;
@@ -75,7 +75,7 @@ void *    OPS_HHTHSFixedNumIter(void)
         const char *argvLoc = OPS_GetString();
         if (strcmp(argvLoc, "-polyOrder") == 0) {
             numData = 1;
-            if (OPS_GetInt(&numData, &polyOrder) != 0) {
+            if (OPS_GetIntInput(&numData, &polyOrder) != 0) {
                 opserr << "WARNING - invalid polyOrder want HHTHSFixedNumIter $rhoInf <-polyOrder $O>\n";
                 opserr << "          or HHTHSFixedNumIter $alphaI $alphaF $beta $gamma <-polyOrder $O>\n";
             }
diff --git a/SRC/analysis/integrator/HHTHSFixedNumIter_TP.cpp b/SRC/analysis/integrator/HHTHSFixedNumIter_TP.cpp
index 0526c24352..eac2b24618 100644
--- a/SRC/analysis/integrator/HHTHSFixedNumIter_TP.cpp
+++ b/SRC/analysis/integrator/HHTHSFixedNumIter_TP.cpp
@@ -65,7 +65,7 @@ void *    OPS_HHTHSFixedNumIter_TP(void)
     else
         numData = 4;
     
-    if (OPS_GetDouble(&numData, dData) != 0) {
+    if (OPS_GetDoubleInput(&numData, dData) != 0) {
         opserr << "WARNING - invalid args want HHTHSFixedNumIter_TP $rhoInf <-polyOrder $O>\n";
         opserr << "          or HHTHSFixedNumIter_TP $alphaI $alphaF $beta $gamma <-polyOrder $O>\n";
         return 0;
@@ -75,7 +75,7 @@ void *    OPS_HHTHSFixedNumIter_TP(void)
         const char *argvLoc = OPS_GetString();
         if (strcmp(argvLoc, "-polyOrder") == 0) {
             numData = 1;
-            if (OPS_GetInt(&numData, &polyOrder) != 0) {
+            if (OPS_GetIntInput(&numData, &polyOrder) != 0) {
                 opserr << "WARNING - invalid polyOrder want HHTHSFixedNumIter_TP $rhoInf <-polyOrder $O>\n";
                 opserr << "          or HHTHSFixedNumIter_TP $alphaI $alphaF $beta $gamma <-polyOrder $O>\n";
             }
diff --git a/SRC/analysis/integrator/HHTHSIncrLimit.cpp b/SRC/analysis/integrator/HHTHSIncrLimit.cpp
index 9c3128eedd..6368ce2ea1 100644
--- a/SRC/analysis/integrator/HHTHSIncrLimit.cpp
+++ b/SRC/analysis/integrator/HHTHSIncrLimit.cpp
@@ -63,7 +63,7 @@ void *    OPS_HHTHSIncrLimit(void)
     else
         numData = 5;
     
-    if (OPS_GetDouble(&numData, dData) != 0) {
+    if (OPS_GetDoubleInput(&numData, dData) != 0) {
         opserr << "WARNING - invalid args want HHTHSIncrLimit $rhoInf $limit <-normType $T>\n";
         opserr << "          or HHTHSIncrLimit $alphaI $alphaF $beta $gamma $limit <-normType $T>\n";
         return 0;
@@ -73,7 +73,7 @@ void *    OPS_HHTHSIncrLimit(void)
         const char *argvLoc = OPS_GetString();
         if (strcmp(argvLoc, "-normType") == 0) {
             numData = 1;
-            if (OPS_GetInt(&numData, &normType) != 0) {
+            if (OPS_GetIntInput(&numData, &normType) != 0) {
                 opserr << "WARNING - invalid normType want HHTHSIncrLimit $rhoInf $limit <-normType $T>\n";
                 opserr << "          or HHTHSIncrLimit $alphaI $alphaF $beta $gamma $limit <-normType $T>\n";
             }
diff --git a/SRC/analysis/integrator/HHTHSIncrLimit_TP.cpp b/SRC/analysis/integrator/HHTHSIncrLimit_TP.cpp
index 1f19c6400e..a1d6d1e637 100644
--- a/SRC/analysis/integrator/HHTHSIncrLimit_TP.cpp
+++ b/SRC/analysis/integrator/HHTHSIncrLimit_TP.cpp
@@ -63,7 +63,7 @@ void *    OPS_HHTHSIncrLimit_TP(void)
     else
         numData = 5;
     
-    if (OPS_GetDouble(&numData, dData) != 0) {
+    if (OPS_GetDoubleInput(&numData, dData) != 0) {
         opserr << "WARNING - invalid args want HHTHSIncrLimit_TP $rhoInf $limit <-normType $T>\n";
         opserr << "          or HHTHSIncrLimit_TP $alphaI $alphaF $beta $gamma $limit <-normType $T>\n";
         return 0;
@@ -73,7 +73,7 @@ void *    OPS_HHTHSIncrLimit_TP(void)
         const char *argvLoc = OPS_GetString();
         if (strcmp(argvLoc, "-normType") == 0) {
             numData = 1;
-            if (OPS_GetInt(&numData, &normType) != 0) {
+            if (OPS_GetIntInput(&numData, &normType) != 0) {
                 opserr << "WARNING - invalid normType want HHTHSIncrLimit_TP $rhoInf $limit <-normType $T>\n";
                 opserr << "          or HHTHSIncrLimit_TP $alphaI $alphaF $beta $gamma $limit <-normType $T>\n";
             }
diff --git a/SRC/analysis/integrator/HHTHSIncrReduct.cpp b/SRC/analysis/integrator/HHTHSIncrReduct.cpp
index fa2f668ba8..6a76c49700 100755
--- a/SRC/analysis/integrator/HHTHSIncrReduct.cpp
+++ b/SRC/analysis/integrator/HHTHSIncrReduct.cpp
@@ -56,7 +56,7 @@ void *    OPS_HHTHSIncrReduct(void)
     }
     
     double dData[5];
-    if (OPS_GetDouble(&argc, dData) != 0) {
+    if (OPS_GetDoubleInput(&argc, dData) != 0) {
         opserr << "WARNING - invalid args want HHTHSIncrReduct $rhoInf $reduct\n";
         opserr << "          or HHTHSIncrReduct $alphaI $alphaF $beta $gamma $reduct\n";
         return 0;
diff --git a/SRC/analysis/integrator/HHTHSIncrReduct_TP.cpp b/SRC/analysis/integrator/HHTHSIncrReduct_TP.cpp
index 6e8d001177..a793cfdd90 100644
--- a/SRC/analysis/integrator/HHTHSIncrReduct_TP.cpp
+++ b/SRC/analysis/integrator/HHTHSIncrReduct_TP.cpp
@@ -56,7 +56,7 @@ void *    OPS_HHTHSIncrReduct_TP(void)
     }
     
     double dData[5];
-    if (OPS_GetDouble(&argc, dData) != 0) {
+    if (OPS_GetDoubleInput(&argc, dData) != 0) {
         opserr << "WARNING - invalid args want HHTHSIncrReduct_TP $rhoInf $reduct\n";
         opserr << "          or HHTHSIncrReduct_TP $alphaI $alphaF $beta $gamma $reduct\n";
         return 0;
diff --git a/SRC/analysis/integrator/HHT_TP.cpp b/SRC/analysis/integrator/HHT_TP.cpp
index 078bc6032e..f0b33d8efc 100644
--- a/SRC/analysis/integrator/HHT_TP.cpp
+++ b/SRC/analysis/integrator/HHT_TP.cpp
@@ -56,7 +56,7 @@ void *    OPS_HHT_TP(void)
     }
     
     double dData[3];
-    if (OPS_GetDouble(&argc, dData) != 0) {
+    if (OPS_GetDoubleInput(&argc, dData) != 0) {
         opserr << "WARNING - invalid args want HHT_TP $alpha <$gamma $beta>\n";
         return 0;
     }
diff --git a/SRC/analysis/integrator/HSConstraint.cpp b/SRC/analysis/integrator/HSConstraint.cpp
index 10f846d3a7..db63461c62 100644
--- a/SRC/analysis/integrator/HSConstraint.cpp
+++ b/SRC/analysis/integrator/HSConstraint.cpp
@@ -399,7 +399,7 @@ HSConstraint::recvSelf(int cTag,
   //alpha2 = data(1);
   deltaLambdaStep = data(1);
   currentLambda = data(2);
-  signLastDeltaLambdaStep = data(3);
+  signLastDeltaLambdaStep = (int)data(3);
   return 0;
 }
 
diff --git a/SRC/analysis/integrator/KRAlphaExplicit.cpp b/SRC/analysis/integrator/KRAlphaExplicit.cpp
index 44f9bed5d6..7650c4f95c 100644
--- a/SRC/analysis/integrator/KRAlphaExplicit.cpp
+++ b/SRC/analysis/integrator/KRAlphaExplicit.cpp
@@ -48,7 +48,7 @@ void *    OPS_KRAlphaExplicit(void)
     bool updElemDisp = false;
     double rhoInf;
     int numData = 1;
-    if (OPS_GetDouble(&numData, &rhoInf) != 0) {
+    if (OPS_GetDoubleInput(&numData, &rhoInf) != 0) {
         opserr << "WARNING - invalid args want KRAlphaExplicit $rhoInf <-updateElemDisp>\n";
         return 0;
     }
diff --git a/SRC/analysis/integrator/KRAlphaExplicit_TP.cpp b/SRC/analysis/integrator/KRAlphaExplicit_TP.cpp
index a998c6f0c2..3b33472780 100644
--- a/SRC/analysis/integrator/KRAlphaExplicit_TP.cpp
+++ b/SRC/analysis/integrator/KRAlphaExplicit_TP.cpp
@@ -47,7 +47,7 @@ void *    OPS_KRAlphaExplicit_TP(void)
     }
     
     double rhoInf;
-    if (OPS_GetDouble(&argc, &rhoInf) != 0) {
+    if (OPS_GetDoubleInput(&argc, &rhoInf) != 0) {
         opserr << "WARNING - invalid args want KRAlphaExplicit_TP $rhoInf\n";
         return 0;
     }
diff --git a/SRC/analysis/integrator/Newmark.cpp b/SRC/analysis/integrator/Newmark.cpp
index e0284e453c..3ee415392d 100644
--- a/SRC/analysis/integrator/Newmark.cpp
+++ b/SRC/analysis/integrator/Newmark.cpp
@@ -71,7 +71,7 @@ OPS_Newmark(void)
   int dispFlag = 1;
   double dData[2];
   int numData = 2;
-  if (OPS_GetDouble(&numData, dData) != 0) {
+  if (OPS_GetDoubleInput(&numData, dData) != 0) {
     opserr << "WARNING - invalid args want Newmark $gamma $beta <-form $typeUnknown>\n";
     return 0;
   }
@@ -524,7 +524,7 @@ int Newmark::recvSelf(int cTag, Channel &theChannel, FEM_ObjectBroker &theBroker
     
     gamma  = data(0);
     beta   = data(1);
-    displ  = data(2);
+    displ  = (int)data(2);
 
     return 0;
 }
diff --git a/SRC/analysis/integrator/NewmarkExplicit.cpp b/SRC/analysis/integrator/NewmarkExplicit.cpp
index d63201650f..88fcabebfc 100644
--- a/SRC/analysis/integrator/NewmarkExplicit.cpp
+++ b/SRC/analysis/integrator/NewmarkExplicit.cpp
@@ -55,7 +55,7 @@ void*  OPS_NewmarkExplicit(void)
     }
     
     double gamma;    
-    if (OPS_GetDouble(&argc, &gamma) != 0) {
+    if (OPS_GetDoubleInput(&argc, &gamma) != 0) {
         opserr << "WARNING - invalid args want NewmarkExplicit $gamma\n";
         return 0;
     }
diff --git a/SRC/analysis/integrator/NewmarkHSFixedNumIter.cpp b/SRC/analysis/integrator/NewmarkHSFixedNumIter.cpp
index cba75d1157..688b902fe6 100755
--- a/SRC/analysis/integrator/NewmarkHSFixedNumIter.cpp
+++ b/SRC/analysis/integrator/NewmarkHSFixedNumIter.cpp
@@ -60,7 +60,7 @@ void *   OPS_NewmarkHSFixedNumIter(void)
     bool updDomFlag = true;
     int numData = 2;
     
-    if (OPS_GetDouble(&numData, dData) != 0) {
+    if (OPS_GetDoubleInput(&numData, dData) != 0) {
         opserr << "WARNING - invalid args want NewmarkHSFixedNumIter $gamma $beta <-polyOrder $O>\n";
         return 0;
     }
@@ -69,7 +69,7 @@ void *   OPS_NewmarkHSFixedNumIter(void)
         const char *argvLoc = OPS_GetString();
         if (strcmp(argvLoc, "-polyOrder") == 0) {
             numData = 1;
-            if (OPS_GetInt(&numData, &polyOrder) != 0) {
+            if (OPS_GetIntInput(&numData, &polyOrder) != 0) {
                 opserr << "WARNING - invalid polyOrder want NewmarkHSFixedNumIter $gamma $beta <-polyOrder $O>\n";
             }
         }
diff --git a/SRC/analysis/integrator/NewmarkHSIncrLimit.cpp b/SRC/analysis/integrator/NewmarkHSIncrLimit.cpp
index 3a59762f85..0d068e2ae2 100644
--- a/SRC/analysis/integrator/NewmarkHSIncrLimit.cpp
+++ b/SRC/analysis/integrator/NewmarkHSIncrLimit.cpp
@@ -58,7 +58,7 @@ void *  OPS_NewmarkHSIncrLimit(void)
     int normType = 2;
     int numData = 3;
     
-    if (OPS_GetDouble(&numData, dData) != 0) {
+    if (OPS_GetDoubleInput(&numData, dData) != 0) {
         opserr << "WARNING - invalid args want NewmarkHSIncrLimit $gamma $beta $limit <-normType $T>\n";
         return 0;
     }
@@ -67,7 +67,7 @@ void *  OPS_NewmarkHSIncrLimit(void)
         const char *argvLoc = OPS_GetString();
         if (strcmp(argvLoc, "-normType") == 0) {
             numData = 1;
-            if (OPS_GetInt(&numData, &normType) != 0) {
+            if (OPS_GetIntInput(&numData, &normType) != 0) {
                 opserr << "WARNING - invalid normType want NewmarkHSIncrLimit $gamma $beta $limit <-normType $T>\n";
             }
         }
diff --git a/SRC/analysis/integrator/NewmarkHSIncrReduct.cpp b/SRC/analysis/integrator/NewmarkHSIncrReduct.cpp
index 43683e8968..6a8d630886 100755
--- a/SRC/analysis/integrator/NewmarkHSIncrReduct.cpp
+++ b/SRC/analysis/integrator/NewmarkHSIncrReduct.cpp
@@ -55,7 +55,7 @@ void * OPS_NewmarkHSIncrReduct(void)
     }
     
     double dData[3];
-    if (OPS_GetDouble(&argc, dData) != 0) {
+    if (OPS_GetDoubleInput(&argc, dData) != 0) {
         opserr << "WARNING - invalid args want NewmarkHSIncrReduct $gamma $beta $reduct\n";
         return 0;
     }
diff --git a/SRC/analysis/integrator/PFEMIntegrator.cpp b/SRC/analysis/integrator/PFEMIntegrator.cpp
index 9712577661..7bdd2d45d4 100644
--- a/SRC/analysis/integrator/PFEMIntegrator.cpp
+++ b/SRC/analysis/integrator/PFEMIntegrator.cpp
@@ -64,7 +64,7 @@ OPS_PFEMIntegrator(void)
     double dData[2] = {-1.0, -1.0};
     int numData = 2;
     if (OPS_GetNumRemainingInputArgs() > 1) {
-        if (OPS_GetDouble(&numData, dData) < 0) {
+        if (OPS_GetDoubleInput(&numData, dData) < 0) {
             OPS_ResetCurrentInputArg(-2);
         }
     }
@@ -743,8 +743,8 @@ int PFEMIntegrator::recvSelf(int cTag, Channel &theChannel, FEM_ObjectBroker &th
 
     gamma  = data(0);
     beta   = data(1);
-    displ  = data(2);
-    init   = data(3);
+    displ  = (int)data(2);
+    init   = (int)data(3);
     return 0;
 }
 
diff --git a/SRC/analysis/integrator/StagedNewmark.cpp b/SRC/analysis/integrator/StagedNewmark.cpp
index 40c3367911..8a2aefd312 100644
--- a/SRC/analysis/integrator/StagedNewmark.cpp
+++ b/SRC/analysis/integrator/StagedNewmark.cpp
@@ -67,7 +67,7 @@ OPS_StagedNewmark(void)
   bool dispFlag = true;
   double dData[2];
   int numData = 2;
-  if (OPS_GetDouble(&numData, dData) != 0) {
+  if (OPS_GetDoubleInput(&numData, dData) != 0) {
     opserr << "WARNING - invalid args want StagedNewmark $gamma $beta <-form $typeUnknown>\n";
     return 0;
   }
diff --git a/SRC/analysis/integrator/WilsonTheta.cpp b/SRC/analysis/integrator/WilsonTheta.cpp
index 78e1f15eac..8cd1d34f4c 100644
--- a/SRC/analysis/integrator/WilsonTheta.cpp
+++ b/SRC/analysis/integrator/WilsonTheta.cpp
@@ -55,7 +55,7 @@ void *    OPS_WilsonTheta(void)
     }
     
     double theta;    
-    if (OPS_GetDouble(&argc, &theta) != 0) {
+    if (OPS_GetDoubleInput(&argc, &theta) != 0) {
         opserr << "WARNING - invalid args want WilsonTheta $theta\n";
         return 0;
     }