upgrade aqm from gfs_v15p2 to gfs_v16

tests/default_vars.sh

@@ -89,8 +89,8 @@
  export OCN_tasks_cdeps_025=120
  export ICE_tasks_cdeps_025=48
 
- export INPES_aqm=33
- export JNPES_aqm=8
+ export INPES_aqm=50
+ export JNPES_aqm=34
 
  export THRD_cpl_unstr=1
  export INPES_cpl_unstr=3

tests/fv3_conf/fv3_aqm.IN

@@ -1,35 +1,8 @@
 rm -rf INPUT RESTART
-mkdir INPUT RESTART
+mkdir RESTART
 
-cp -r @[INPUTDATA_ROOT]/AQM/INPUT/* ./INPUT/
-cp -r @[INPUTDATA_ROOT]/AQM/NEXUS .
+cp -r /scratch1/NCEPDEV/nems/Brian.Curtis/AQM_gfsv16/INPUT .
+cp -r /scratch1/NCEPDEV/nems/Brian.Curtis/AQM_gfsv16/fix/* .
 
-cp @[INPUTDATA_ROOT]/AQM/fix/C775.facsf.tile7.halo0.nc C775.facsf.tile1.nc
-cp @[INPUTDATA_ROOT]/AQM/fix/C775.facsf.tile7.halo4.nc C775.facsf.tile7.nc
-cp @[INPUTDATA_ROOT]/AQM/fix/C775.maximum_snow_albedo.tile7.halo0.nc C775.maximum_snow_albedo.tile1.nc
-cp @[INPUTDATA_ROOT]/AQM/fix/C775.maximum_snow_albedo.tile7.halo4.nc C775.maximum_snow_albedo.tile7.nc
-cp @[INPUTDATA_ROOT]/AQM/fix/C775.slope_type.tile7.halo0.nc C775.slope_type.tile1.nc
-cp @[INPUTDATA_ROOT]/AQM/fix/C775.slope_type.tile7.halo4.nc C775.slope_type.tile7.nc
-cp @[INPUTDATA_ROOT]/AQM/fix/C775.snowfree_albedo.tile7.halo0.nc C775.snowfree_albedo.tile1.nc
-cp @[INPUTDATA_ROOT]/AQM/fix/C775.snowfree_albedo.tile7.halo4.nc C775.snowfree_albedo.tile7.nc
-cp @[INPUTDATA_ROOT]/AQM/fix/C775.soil_type.tile7.halo0.nc C775.soil_type.tile1.nc
-cp @[INPUTDATA_ROOT]/AQM/fix/C775.soil_type.tile7.halo4.nc C775.soil_type.tile7.nc
-cp @[INPUTDATA_ROOT]/AQM/fix/C775.substrate_temperature.tile7.halo0.nc C775.substrate_temperature.tile1.nc
-cp @[INPUTDATA_ROOT]/AQM/fix/C775.substrate_temperature.tile7.halo4.nc C775.substrate_temperature.tile7.nc
-cp @[INPUTDATA_ROOT]/AQM/fix/C775.vegetation_greenness.tile7.halo0.nc C775.vegetation_greenness.tile1.nc
-cp @[INPUTDATA_ROOT]/AQM/fix/C775.vegetation_greenness.tile7.halo4.nc C775.vegetation_greenness.tile7.nc
-cp @[INPUTDATA_ROOT]/AQM/fix/C775.vegetation_type.tile7.halo0.nc C775.vegetation_type.tile1.nc
-cp @[INPUTDATA_ROOT]/AQM/fix/C775.vegetation_type.tile7.halo4.nc C775.vegetation_type.tile7.nc
-cp @[INPUTDATA_ROOT]/AQM/fix/AE_cb6r3_ae6_aq.nml .
-cp @[INPUTDATA_ROOT]/AQM/fix/BEIS_RRFScmaq_C775.ncf .
-cp @[INPUTDATA_ROOT]/AQM/fix/CSQY_DATA_cb6r3_ae6_aq .
-cp @[INPUTDATA_ROOT]/AQM/fix/GC_cb6r3_ae6_aq.nml .
-cp @[INPUTDATA_ROOT]/AQM/fix/global_soilmgldas.t126.384.190.grb .
-cp @[INPUTDATA_ROOT]/AQM/fix/gspro_biogenics_1mar2017.txt .
-cp @[INPUTDATA_ROOT]/AQM/fix/Hourly_Emissions_regrid_rrfs_13km_20190801_t12z_h72.nc .
-cp @[INPUTDATA_ROOT]/AQM/fix/NR_cb6r3_ae6_aq.nml .
-cp @[INPUTDATA_ROOT]/AQM/fix/omi_cmaq_2015_361X179.dat .
-cp @[INPUTDATA_ROOT]/AQM/fix/PHOT_OPTICS.dat .
-cp @[INPUTDATA_ROOT]/AQM/fix/Species_Table_TR_0.nml .
-cp @[INPUTDATA_ROOT]/AQM/fix/pt-2019080112.nc .
-cp @[INPUTDATA_ROOT]/AQM/fix/FENGSHA_p8_10km_inputs_CONUS_775.nc .
+#cp -r @[INPUTDATA_ROOT]/AQMv16/INPUT .
+#cp -r @[INPUTDATA_ROOT]/AQMv16/fix .

tests/fv3_conf/fv3_slurm.IN_hera

@@ -15,7 +15,7 @@ date_s_start=$(date +%s)
 echo -n "${date_s_start}," > job_timestamp.txt
 
 set +x
-#MACHINE_ID=hera
+MACHINE_ID=hera
 source ./module-setup.sh
 module use "@[PWD]/modulefiles"
 module load modules.fv3