added HT material 4 from Li et al 2020. Layered sections now return t…

…heir top layer and bottom layer if layers exceeding these bounds were requested.

SRC/HeatTransfer/HeatTransferMaterial/SFRMCoating.cpp

@@ -91,6 +91,12 @@ SFRMCoating::getConductivity(void)
     else
       materialK = 0.0054+0.000321*700;
   }
+  else if (TypeTag == 4) {
+        if (trial_temp <= 750.0)
+            materialK = 0.11 + 0.00028 * trial_temp;
+        else
+            materialK = 0.32;
+}
   else
     opserr<<"SFRMCoating::unrecognised TypeTag "<<TypeTag;
 
@@ -112,9 +118,12 @@ SFRMCoating::getRho(void)
   else if (TypeTag==2) {
     rho = 423.2;
   }
-  else if (TypeTag==2) {
+  else if (TypeTag==3) {
     rho = 451.8;
   }
+  else if (TypeTag == 4) {
+      rho = 357.0;
+  }
   return rho;
 }
 
@@ -177,6 +186,12 @@ SFRMCoating::getSpecificHeat(void)
 	else 
 		opserr<<"SFRM Coating ,invalid temperature"<<trial_temp;
   }
+  else if (TypeTag == 4) {
+      if (trial_temp <= 1200.0)
+          cp = 1111;
+      else
+          opserr << "SFRM Coating ,invalid temperature" << trial_temp;
+  }
   else
     opserr<<"SFRMCoating::unrecognised TypeTag "<<TypeTag;
   // cp =170;

SRC/OPS_Globals.h

@@ -29,8 +29,8 @@
 
 
 #define OPS_VERSION "3.0.0"
-#define OPSF_VERSION "Anwar-DEBUG 3.2.1"
-#define OPS_LASTUPDATED "24/02/2021"
+#define OPSF_VERSION "Anwar-RELEASE 3.2.3"
+#define OPS_LASTUPDATED "24/04/2021"
 
 #ifndef _WIN64
 #define WIN_ARCH "32-Bit"

SRC/material/section/LayeredShellFiberSectionThermal.cpp

@@ -450,17 +450,20 @@ LayeredShellFiberSectionThermal::setResponse(const char **argv, int argc,
       return 0;
     }
     int pointNum = atoi(argv[1]);
-    if (pointNum > 0 && pointNum <= nLayers) {
-
-      output.tag("FiberOutput");
-      output.attr("number",pointNum);
-      output.attr("zLoc",loci[pointNum-1]);
-      output.attr("thickness",ti[pointNum-1]);
-
-      theResponse =  theFibers[pointNum-1]->setResponse(&argv[2], argc-2, output);
-
-      output.endTag();
+
+    if (pointNum <= 0) {
+        pointNum = 1;
+    }
+    else if (pointNum > nLayers) {
+        pointNum = nLayers;
     }
+    output.tag("FiberOutput");
+    output.attr("number", pointNum);
+    output.attr("zLoc", loci[pointNum - 1]);
+    output.attr("thickness", ti[pointNum - 1]);
+
+    theResponse = theFibers[pointNum - 1]->setResponse(&argv[2], argc - 2, output);
+    output.endTag();
   }
   output.endTag(); // SectionOutput
   return theResponse;

SRC/tcl/commands.cpp

@@ -1253,8 +1253,9 @@ HeatTransfer(ClientData clientData, Tcl_Interp *interp, int argc, TCL_Char **arg
 		theTclHTModule = new TclHeatTransferModule(ndm,interp);
 		return TCL_OK;
 	 }
-	else
-    return TCL_ERROR;
+     else {
+         return TCL_ERROR;
+     }
 
 	}