fix (namelist): Change paramfiles to name without nfix in the name, a…

…nd update ctsm60 file so that it is based on the previous one with the nfix fields just added to the end

bld/namelist_files/namelist_defaults_ctsm.xml

@@ -544,10 +544,10 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
 <!-- The default filenames are given relative to the root directory
      for the CLM2 data in the CESM distribution -->
 <!-- Plant function types (relative to {csmdata}) -->
-<paramfile phys="clm6_0" >lnd/clm2/paramdata/ctsm60_params_nfix.c241101.nc</paramfile>
-<paramfile phys="clm5_1" >lnd/clm2/paramdata/ctsm60_params_nfix.c241101.nc</paramfile>
-<paramfile phys="clm5_0" >lnd/clm2/paramdata/clm50_params_nfix.c241119.nc</paramfile>
-<paramfile phys="clm4_5" >lnd/clm2/paramdata/clm45_params_nfix.c241119.nc</paramfile>
+<paramfile phys="clm6_0" >lnd/clm2/paramdata/ctsm60_params.c241119.nc</paramfile>
+<paramfile phys="clm5_1" >lnd/clm2/paramdata/ctsm60_params.c241119.nc</paramfile>
+<paramfile phys="clm5_0" >lnd/clm2/paramdata/clm50_params.c241119.nc</paramfile>
+<paramfile phys="clm4_5" >lnd/clm2/paramdata/clm45_params.c241119.nc</paramfile>
 
 <!-- ================================================================== -->
 <!-- FATES default parameter file                                       -->