Merge branch 'main' into multiplatform-builds

Author: Zeitsperre

src/GlobalParams.cpp

@@ -404,7 +404,7 @@ void CGlobalParams::InitializeGlobalParameters(global_struct &g, bool is_templat
   g.max_snow_albedo     =DefaultParameterValue(is_template,true);
   g.min_snow_albedo     =DefaultParameterValue(is_template,true);
   g.alb_decay_cold      =DefaultParameterValue(is_template,true);
-  g.alb_decay_cold      =DefaultParameterValue(is_template,true);
+  g.alb_decay_melt      =DefaultParameterValue(is_template,true);
   g.bare_ground_albedo  =DefaultParameterValue(is_template,true);
   g.snowfall_albthresh  =DefaultParameterValue(is_template,true);
 

src/ParseFEWSRunInfo.cpp

@@ -288,7 +288,7 @@ bool ParseNetCDFRunInfoFile(CModel *&pModel, optStruct &Options, bool runname_ov
     if (retval==NC_NOERR){
       for (int i = 0; i < nAttributes; i++) {
         retval=nc_inq_attname(ncid,varid_props,i,att_name);
-        if (retval==NO_ERROR){
+        if (retval==NC_NOERR){
           string att_name_s=to_string(att_name);
 
           // NamedConstant(s) ----------------------------------------------------

src/ParsePropertyFile.cpp

@@ -1577,6 +1577,7 @@ bool ParseClassPropertiesFile(CModel         *&pModel,
 
   delete [] indices;
   for (int i=0;i<MAX_NUM_IN_CLASS;i++){delete [] properties[i];}delete [] properties;
+  delete p;
 
   return true;
 }
@@ -1732,7 +1733,7 @@ void  AddToMasterParamList   (string        *&aPm, class_type       *&aPCm, int
     aPCm_new[nPm+i]=aPC[i];
   }
   if (aPm!=NULL){delete [] aPm; aPm=NULL;}
-  if (aPm!=NULL){delete [] aPCm;aPCm=NULL;}
+  if (aPCm!=NULL){delete [] aPCm;aPCm=NULL;}
   aPm =aPm_new;
   aPCm=aPCm_new;
   nPm=nPm+nP;