Update GOCART, MAPL and ESMF

DusanJovic-NOAA · Oct 7, 2024 · 1eedb52 · 1eedb52
1 parent e3750c2
commit 1eedb52
Show file tree

Hide file tree

Showing 7 changed files with 110 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -150,6 +150,7 @@ endif()
 
 find_package(NetCDF 4.7.4 REQUIRED C Fortran)
 find_package(ESMF 8.3.0 MODULE REQUIRED)
+add_library(ESMF::ESMF ALIAS esmf)
 if(FMS)
   find_package(FMS 2022.04 REQUIRED COMPONENTS R4 R8)
   if(APP MATCHES "^(HAFSW)$")

diff --git a/GOCART b/GOCART
diff --git a/modulefiles/ufs_common.lua b/modulefiles/ufs_common.lua
@@ -10,7 +10,7 @@ local ufs_modules = {
   {["netcdf-c"]        = "4.9.2"},
   {["netcdf-fortran"]  = "4.6.1"},
   {["parallelio"]      = "2.5.10"},
-  {["esmf"]            = "8.6.0"},
+  {["esmf"]            = "8.6.1"},
   {["fms"]             = "2024.01"},
   {["bacio"]           = "2.4.1"},
   {["crtm"]            = "2.4.0"},
@@ -20,7 +20,7 @@ local ufs_modules = {
   {["sp"]              = "2.5.0"},
   {["w3emc"]           = "2.10.0"},
   {["gftl-shared"]     = "1.6.1"},
-  {["mapl"]            = "2.40.3-esmf-8.6.0"},
+  {["mapl"]            = "2.46.3-esmf-8.6.1"},
   {["scotch"]          = "7.0.4"},
 }
 

diff --git a/modulefiles/ufs_hercules.intel.lua b/modulefiles/ufs_hercules.intel.lua
@@ -2,7 +2,7 @@ help([[
 loads UFS Model prerequisites for Hercules/Intel
 ]])
 
-prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.6.0/envs/fms-2024.01/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.6.0/envs/ue-esmf-8.6.1-mapl-2.46.3/install/modulefiles/Core")
 
 stack_intel_ver=os.getenv("stack_intel_ver") or "2021.9.0"
 load(pathJoin("stack-intel", stack_intel_ver))

diff --git a/tests/fv3_conf/cpld_control_run.IN b/tests/fv3_conf/cpld_control_run.IN
@@ -201,4 +201,5 @@ fi
 #prognostic aerosols
 if [ $CPLCHM = .true. ]; then
   ln -sf  @[INPUTDATA_ROOT]/GOCART/p8c_5d/ExtData .
+  cp      ${PATHRT}/parm/gocart/so2_volcanic_emissions_CARN_v202401.degassing_only.rc .
 fi
diff --git a/tests/parm/gocart/SU2G_instance_SU.rc b/tests/parm/gocart/SU2G_instance_SU.rc
@@ -8,7 +8,8 @@ aerosol_monochromatic_optics_file: ExtData/monochromatic/optics_SU.v1_3.nc
 nbins: 4
 
 # Volcanic pointwise sources
-volcano_srcfilen: ExtData/volcanic/so2_volcanic_emissions_Carns.%y4%m2%d2.rc
+volcano_srcfilen_explosive: /dev/null
+volcano_srcfilen_degassing: so2_volcanic_emissions_CARN_v202401.degassing_only.rc
 
 # Heights [m] of LTO, CDS and CRS aviation emissions layers
 aviation_vertical_layers: 0.0 100.0 9.0e3 10.0e3

diff --git a/tests/parm/gocart/so2_volcanic_emissions_CARN_v202401.degassing_only.rc b/tests/parm/gocart/so2_volcanic_emissions_CARN_v202401.degassing_only.rc
@@ -0,0 +1,102 @@
+###  LAT (-90,90), LON (-180,180), SULFUR [kg S/s], ELEVATION [m], CLOUD_COLUMN_HEIGHT [m]
+### If elevation=cloud_column_height, emit in layer of elevation
+### else, emit in top 1/3 of cloud_column_height
+volcano::
+56.060 160.640 4.253340e+00 4835 4835 
+54.760 -163.970 1.606629e+00 2857 2857 
+54.050 159.450 4.402376e+00 1536 1536 
+52.830 -169.770 9.586927e-01 1170 1170 
+52.450 158.200 3.577922e+00 2322 2322 
+52.380 -174.150 8.424235e-01 1533 1533 
+51.790 -178.790 3.583206e-01 1573 1573 
+50.330 155.460 3.324243e+00 1816 1816 
+45.390 148.840 1.290589e+00 1125 1125 
+43.420 142.690 1.117242e+00 2077 2077 
+38.790 15.210 8.783612e-01 870 870 
+37.730 15.000 1.210257e+01 2711 2711 
+36.400 138.530 2.239768e+00 2126 2126 
+34.080 139.530 4.142356e+00 560 560 
+32.880 131.110 4.331558e+00 1181 1181 
+31.590 130.660 5.209919e+00 639 639 
+30.790 130.310 3.334813e+00 614 614 
+29.640 129.720 4.723702e+00 560 560 
+19.420 -155.290 2.690153e+01 1222 1222 
+19.020 -98.620 8.927363e+00 5100 5100 
+16.720 -62.180 5.371639e+00 870 870 
+16.350 145.670 5.316675e+00 320 320 
+15.550 41.830 4.027144e-01 244 244 
+14.760 -91.550 1.312785e+00 3772 3772 
+14.470 -90.880 1.856080e+00 3763 3763 
+13.850 -89.630 6.257399e-01 2381 2381 
+13.260 123.690 2.830627e+00 2462 2462 
+12.770 124.050 1.155293e+00 1500 1500 
+12.700 -87.000 3.116016e+00 1745 1745 
+12.280 93.860 9.660917e-01 230 230 
+11.980 -86.160 5.298706e+00 635 635 
+10.410 123.130 8.709623e-01 2435 2435 
+10.030 -83.770 4.553526e+00 3340 3340 
+4.900 -75.320 5.401235e+00 5321 5321 
+2.930 -76.030 2.532555e+00 5364 5364 
+2.780 125.400 1.974463e+00 1780 1780 
+1.680 127.880 1.039870e+01 1170 1170 
+1.360 124.790 8.857602e-01 1580 1580 
+1.200 -77.390 9.090140e-01 4276 4276 
+-0.080 -77.660 1.278962e+00 3562 3562 
+-1.410 29.200 1.577351e+01 2950 2950 
+-1.470 -78.440 1.601344e+00 5023 5023 
+-1.700 101.260 1.659479e+00 3760 3760 
+-4.080 145.040 8.587012e+00 1730 1730 
+-4.240 152.210 6.947615e+00 200 200 
+-5.050 151.330 3.321072e+00 2300 2300 
+-5.530 148.420 3.618087e+00 991 991 
+-6.140 155.200 1.856080e+01 1750 1750 
+-7.240 109.210 1.009428e+00 3329 3329 
+-7.560 110.440 1.543210e-01 2968 2968 
+-7.940 112.950 4.439371e+00 2258 2258 
+-8.060 114.240 3.156181e+00 2799 2799 
+-8.270 123.510 3.025114e+00 1339 1339 
+-10.380 165.800 1.172205e+00 851 851 
+-14.270 167.500 2.025199e+00 797 797 
+-15.400 167.830 1.574920e+01 1395 1395 
+-16.250 168.120 3.712794e+01 1334 1334 
+-16.340 -70.900 9.682056e-01 5400 5400 
+-19.530 169.440 8.988669e+00 280 280 
+-19.750 -175.070 1.282133e+00 515 515 
+-21.230 55.710 1.044309e+00 2460 2460 
+-25.170 -68.500 1.338153e+00 5697 5697 
+-37.520 177.180 1.626712e+00 321 321 
+-39.420 -71.930 1.454422e+00 2847 2847 
+-57.800 -26.490 1.322298e+00 990 990 
+-58.420 -26.330 6.553357e-01 1370 1370 
+-77.530 167.170 2.737612e-01 3794 3794 
+61.300 -152.250 3.995434e-01 3374 3374 
+59.350 -153.450 3.836885e-01 1252 1252 
+56.640 161.340 3.405632e+00 3283 3283 
+-0.390 100.460 1.522070e-01 2686 2686 
+-8.510 124.130 2.212286e+00 862 862 
+13.600 40.670 1.136268e+00 613 613 
+47.340 152.480 7.081854e-01 870 870 
+48.080 153.210 1.128869e+00 1200 1200 
+60.490 -152.750 1.395231e+00 3108 3108 
+55.120 160.360 3.678336e+00 2376 2376 
+53.250 158.830 3.100161e+00 2741 2741 
+18.140 145.790 2.376120e+00 570 570 
+14.520 120.470 4.693049e-01 1388 1388 
+13.420 -88.470 5.358955e-01 1449 1449 
+3.170 98.390 1.857137e+00 2460 2460 
+-6.110 105.420 1.601344e+00 813 813 
+-8.210 119.070 3.266109e-01 1949 1949 
+-15.800 -71.860 1.605572e+00 5967 5967 
+-37.860 -71.160 2.182691e+00 2800 2800 
+-8.420 116.470 3.107560e-01 3726 3726 
+-8.320 121.710 3.012430e-01 875 875 
+-8.820 121.180 3.784035e-01 2124 2124 
+-19.150 -68.830 4.048283e-01 5550 5550 
+27.250 140.870 1.055936e+00 38 38 
+10.460 -84.700 1.491417e+00 1670 1670 
+-0.830 -91.170 3.086420e-01 1124 1124 
+55.410 -161.890 1.052765e+00 2490 2490 
+-2.000 -78.340 4.185693e-01 5286 5286 
+-3.610 144.590 4.227972e+00 370 370 
+-8.340 115.510 2.505074e-01 2800 2800 
+::