switch back to bilinear interpolation, setup some TEM defaults

	modified:   bld/build-namelist
	modified:   bld/namelist_files/namelist_defaults_cam.xml
	modified:   src/utils/ctem_diags_mod.F90
	modified:   src/utils/esmf_phys2lonlat_mod.F90

Author: fvitt

bld/build-namelist

@@ -798,6 +798,11 @@ if ($docosp) {
     add_default($nl, 'docosp', 'val'=>'.true.');
 }
 
+# TEM diags
+if ($phys =~ /cam7/) {
+    add_default($nl, 'ctem_diags_numlats');
+    add_default($nl, 'cam_physics_mesh');
+}
 
 # Constituents
 # ============

bld/namelist_files/namelist_defaults_cam.xml

@@ -951,6 +951,10 @@
 <cam_physics_mesh hgrid="ne30np4" npg="3">atm/cam/coords/ne30pg3_esmf_20200428.nc</cam_physics_mesh>
 <cam_physics_mesh hgrid="ne120np4" npg="3">share/meshes/ne120pg3_ESMFmesh_cdf5_c20211018.nc</cam_physics_mesh>
 
+<!-- For ESMF regrid zonal-mean TEM diagnostics -->
+<ctem_diags_numlats hgrid="ne16np4">90</ctem_diags_numlats>
+<ctem_diags_numlats hgrid="ne30np4">180</ctem_diags_numlats>
+
 <!-- For scaling lightning sources of NOx -->
 <lght_no_prd_factor                                              >1.00D0</lght_no_prd_factor>
 <lght_no_prd_factor                hgrid="ne30np4"                  >1.80D0</lght_no_prd_factor>

src/utils/ctem_diags_mod.F90

@@ -14,7 +14,7 @@ module ctem_diags_mod
   use spmd_utils, only: masterproc
   use ref_pres, only: pref_mid
   use esmf_lonlat_grid_mod, only: beglon=>lon_beg, endlon=>lon_end, beglat=>lat_beg, endlat=>lat_end
-  use cam_history,  only: addfld, outfld, horiz_only
+  use cam_history,  only: addfld, outfld, horiz_only, add_default
   use cam_history_support, only : fillvalue
   use perf_mod, only: t_startf, t_stopf
   use cam_logfile, only: iulog
@@ -223,6 +223,17 @@ subroutine ctem_diags_init()
     call addfld ('PStem', horiz_only, 'A', 'Pa', 'Surface Pressure', gridname='ctem_lonlat')
     call addfld ('MSKtem',horiz_only, 'A', '1',  'TEM mask', gridname='ctem_lonlat' )
 
+    ! default monthly-means
+    call add_default('Uzm',1,' ')
+    call add_default('Vzm',1,' ')
+    call add_default('Wzm',1,' ')
+    call add_default('THzm',1,' ')
+    call add_default('VTHzm',1,' ')
+    call add_default('WTHzm',1,' ')
+    call add_default('UVzm',1,' ')
+    call add_default('UWzm',1,' ')
+    call add_default('PSzm',1,' ')
+
   end subroutine ctem_diags_init
 
   !-----------------------------------------------------------------------------

src/utils/esmf_phys2lonlat_mod.F90

@@ -13,7 +13,7 @@ module esmf_phys2lonlat_mod
   use ESMF, only: ESMF_FieldCreate, ESMF_FieldRegridStore
   use ESMF, only: ESMF_FieldGet, ESMF_FieldRegrid
   use ESMF, only: ESMF_KIND_I4, ESMF_KIND_R8, ESMF_TYPEKIND_R8
-  use ESMF, only: ESMF_REGRIDMETHOD_CONSERVE
+  use ESMF, only: ESMF_REGRIDMETHOD_BILINEAR, ESMF_POLEMETHOD_ALLAVG, ESMF_EXTRAPMETHOD_NEAREST_IDAVG
   use ESMF, only: ESMF_TERMORDER_SRCSEQ, ESMF_MESHLOC_ELEMENT, ESMF_STAGGERLOC_CENTER
   use ESMF, only: ESMF_FieldDestroy, ESMF_RouteHandleDestroy
   use esmf_check_error_mod, only: check_esmf_error
@@ -101,19 +101,21 @@ subroutine esmf_phys2lonlat_init()
     call check_esmf_error(rc, subname//'ESMF_FieldCreate 2D lonlat fld ERROR')
 
     call ESMF_FieldRegridStore(srcField=physfld_3d, dstField=lonlatfld_3d, &
-         regridMethod=ESMF_REGRIDMETHOD_CONSERVE, &
-         routeHandle=rh_phys2lonlat_3d, &
-         srcTermProcessing=smm_srctermproc, &
-         pipelineDepth=smm_pipelinedep, &
-         rc=rc)
+         regridMethod=ESMF_REGRIDMETHOD_BILINEAR,                          &
+         polemethod=ESMF_POLEMETHOD_ALLAVG,                                &
+         extrapMethod=ESMF_EXTRAPMETHOD_NEAREST_IDAVG,                     &
+         routeHandle=rh_phys2lonlat_3d, factorIndexList=factorIndexList,   &
+         factorList=factorList, srcTermProcessing=smm_srctermproc,         &
+         pipelineDepth=smm_pipelinedep, rc=rc)
     call check_esmf_error(rc, subname//'ESMF_FieldRegridStore 3D routehandle ERROR')
 
     call ESMF_FieldRegridStore(srcField=physfld_2d, dstField=lonlatfld_2d, &
-         regridMethod=ESMF_REGRIDMETHOD_CONSERVE, &
-         routeHandle=rh_phys2lonlat_2d, &
-         srcTermProcessing=smm_srctermproc, &
-         pipelineDepth=smm_pipelinedep, &
-         rc=rc)
+         regridMethod=ESMF_REGRIDMETHOD_BILINEAR,                          &
+         polemethod=ESMF_POLEMETHOD_ALLAVG,                                &
+         extrapMethod=ESMF_EXTRAPMETHOD_NEAREST_IDAVG,                     &
+         routeHandle=rh_phys2lonlat_2d, factorIndexList=factorIndexList,   &
+         factorList=factorList, srcTermProcessing=smm_srctermproc,         &
+         pipelineDepth=smm_pipelinedep, rc=rc)
     call check_esmf_error(rc, subname//'ESMF_FieldRegridStore 3D routehandle ERROR')
 
   end subroutine esmf_phys2lonlat_init