cam6_3_086: Introduce PUMAS DDT

Externals.cfg

@@ -64,7 +64,7 @@ local_path = libraries/parallelio
 required = True
 
 [cime]
-tag = cime6.0.64
+tag = cime6.0.76
 protocol = git
 repo_url = https://github.com/ESMCI/cime
 local_path = cime

Externals_CAM.cfg

@@ -37,7 +37,7 @@ required = True
 local_path = src/physics/pumas
 protocol = git
 repo_url = https://github.com/ESCOMP/PUMAS
-tag = pumas_cam-release_v1.27
+tag = pumas_cam-release_v1.28
 required = True
 
 [pumas-frozen]

bld/configure

@@ -1660,7 +1660,7 @@ elsif ($fc =~ /nvfor/)  { $fc_type = 'nvhpc'; }
 
 # User override for Fortran compiler type
 if (defined $opts{'fc_type'}) { $fc_type = $opts{'fc_type'}; }
-
+if ($fc_type == "oneapi") {$fc_type = 'intel'; }
 if ($fc_type) {
     $cfg_ref->set('fc_type', $fc_type);
     if ($print>=2) { print "Fortran compiler type: $fc_type$eol"; }
@@ -2150,6 +2150,9 @@ sub write_filepath
     }
     if ($waccm_phys) {
         print $fh "$camsrcdir/src/physics/waccm\n";
+	print $fh "$camsrcdir/src/physics/ali_arms\n";
+	print $fh "$camsrcdir/src/physics/ali_arms/subs\n";
+	print $fh "$camsrcdir/src/physics/ali_arms/include\n";
     }
     print $fh "$camsrcdir/src/ionosphere\n";
 
@@ -2178,10 +2181,6 @@ sub write_filepath
 	print $fh "$camsrcdir/src/physics/pumas-frozen\n";
     }
 
-    print $fh "$camsrcdir/src/physics/ali_arms\n";
-    print $fh "$camsrcdir/src/physics/ali_arms/subs\n";
-    print $fh "$camsrcdir/src/physics/ali_arms/include\n";
-
     # Superparameterization
     if ($phys_pkg eq 'spcam_m2005' or $phys_pkg eq 'spcam_sam1mom') {
         print $fh "$camsrcdir/src/physics/spcam\n";

cime_config/buildcpp

@@ -11,7 +11,7 @@ import os, sys, re
 CIMEROOT = os.environ.get("CIMEROOT")
 if CIMEROOT is None:
     raise SystemExit("ERROR: must set CIMEROOT environment variable")
-sys.path.append(os.path.join(CIMEROOT, "scripts", "Tools"))
+sys.path.append(os.path.join(CIMEROOT, "CIME", "Tools"))
 
 from standard_script_setup import *
 

cime_config/buildlib

@@ -12,7 +12,7 @@ _CIMEROOT = os.environ.get("CIMEROOT")
 if _CIMEROOT is None:
     raise SystemExit("ERROR: must set CIMEROOT environment variable")
 
-_LIBDIR = os.path.join(_CIMEROOT, "scripts", "Tools")
+_LIBDIR = os.path.join(_CIMEROOT, "CIME", "Tools")
 sys.path.append(_LIBDIR)
 
 from standard_script_setup import *
@@ -99,7 +99,7 @@ def _build_cam(caseroot, libroot, bldroot):
         complib  = os.path.join(libroot, "libatm.a")
         makefile = os.path.join(casetools, "Makefile")
 
-        cmd = "{} complib -j {} MODEL=cam COMPLIB={} -f {} {} " \
+        cmd = "{} complib -j {} COMP_NAME=cam COMPLIB={} -f {} {} " \
             .format(gmake, gmake_j, complib, makefile, get_standard_makefile_args(case))
         if cam_cppdefs:
             cmd += " USER_CPPDEFS='{}'".format(cam_cppdefs)

cime_config/testdefs/testlist_cam.xml

@@ -1516,7 +1516,7 @@
       <option name="wallclock">00:20:00</option>
     </options>
   </test>
-  <test compset="FCnudged" grid="ne0CONUSne30x8_ne0CONUSne30x8_mt12" name="SMS_D_Ln9_Vnuopc" testmods="cam/outfrq9s_refined_camchem">
+  <test compset="FCnudged" grid="ne0CONUSne30x8_ne0CONUSne30x8_mt12" name="SMS_D_Ln9_Vnuopc_P720x1" testmods="cam/outfrq9s">
     <machines>
       <machine name="cheyenne" compiler="intel" category="prealpha"/>
       <machine name="cheyenne" compiler="intel" category="camchem"/>
@@ -1622,7 +1622,7 @@
       <machine name="cheyenne" compiler="intel" category="camchem"/>
     </machines>
   </test>
-  <test compset="FCHIST" grid="ne0CONUSne30x8_ne0CONUSne30x8_mt12" name="SMS_D_Ln9_Vnuopc" testmods="cam/outfrq9s_refined_camchem">
+  <test compset="FCHIST" grid="ne0CONUSne30x8_ne0CONUSne30x8_mt12" name="SMS_D_Ln9_Vnuopc_P720x1" testmods="cam/outfrq9s">
     <machines>
       <machine name="cheyenne" compiler="intel" category="aux_cam"/>
       <machine name="cheyenne" compiler="intel" category="camchem"/>

src/control/cam_history_support.F90

@@ -308,6 +308,7 @@ module cam_history_support
   public     :: lookup_hist_coord_indices, hist_coord_find_levels
   public     :: get_hist_coord_index, hist_coord_name, hist_coord_size
   public     :: hist_dimension_name
+  public     :: hist_dimension_values
 
   interface add_hist_coord
     module procedure add_hist_coord_regonly
@@ -318,7 +319,12 @@ module cam_history_support
   interface hist_coord_size
     module procedure hist_coord_size_char
     module procedure hist_coord_size_int
-  end interface
+ end interface hist_coord_size
+
+ interface hist_dimension_values
+    module procedure hist_dimension_values_r8
+    module procedure hist_dimension_values_int
+ end interface hist_dimension_values
 
   interface assignment(=)
     module procedure field_copy
@@ -1938,7 +1944,7 @@ end function hist_coord_find_levels
 
   !#######################################################################
 
-  character(len=max_hcoordname_len) function hist_dimension_name (size)
+  character(len=max_hcoordname_len) function hist_dimension_name(size)
   ! Given a specific size value, return the first registered dimension name which matches the size, if it exists
   ! Otherwise the name returned is blank
 
@@ -1959,4 +1965,134 @@ end function hist_dimension_name
 
   !#######################################################################
 
+  subroutine hist_dimension_values_r8(name, rvalues, istart, istop, found)
+     ! Given the name of a dimension, return its (real) values in <rvalues>
+     ! If <istart> and <istop> are present, they are the beginning and ending
+     ! indices of the dimension values to return in <rvalues>. By default,
+     ! the entire array is copied.
+     ! If <found> is passed, return .true. if <name> is a defined dimension
+     !       with real values.
+
+     ! Dummy arguments
+     character(len=*),  intent(in)  :: name
+     real(r8),          intent(out) :: rvalues(:)
+     integer, optional, intent(in)  :: istart
+     integer, optional, intent(in)  :: istop
+     logical, optional, intent(out) :: found
+     ! Local variables
+     integer :: indx, jndx, rndx
+     integer :: ibeg
+     integer :: iend
+     logical :: dim_ok
+     real(r8), parameter :: unset_r8 = huge(1.0_r8)
+     character(len=*), parameter  :: subname = ': hist_dimension_values_r8'
+
+     dim_ok = .false.
+     rvalues(:) = unset_r8
+
+     do indx = 1, registeredmdims
+        if(trim(name) == trim(hist_coords(indx)%name)) then
+           dim_ok = associated(hist_coords(indx)%real_values)
+           if (dim_ok) then
+              if (present(istart)) then
+                 ibeg = istart
+                 if (ibeg < LBOUND(hist_coords(indx)%real_values, 1)) then
+                    call endrun(subname//": istart is outside the bounds")
+                 end if
+              else
+                 ibeg = LBOUND(hist_coords(indx)%real_values, 1)
+              end if
+              if (present(istop)) then
+                 iend = istop
+                 if (iend > UBOUND(hist_coords(indx)%real_values, 1)) then
+                    call endrun(subname//": istop is outside the bounds")
+                 end if
+              else
+                 iend = UBOUND(hist_coords(indx)%real_values, 1)
+              end if
+              if (SIZE(rvalues) < (iend - ibeg + 1)) then
+                 call endrun(subname//": rvalues too small")
+              end if
+              rndx = 1
+              do jndx = ibeg, iend
+                 rvalues(rndx) = hist_coords(indx)%real_values(jndx)
+                 rndx = rndx + 1
+              end do
+           end if
+           exit
+        end if
+     end do
+     if (present(found)) then
+        found = dim_ok
+     end if
+
+  end subroutine hist_dimension_values_r8
+
+  !#######################################################################
+
+  subroutine hist_dimension_values_int(name, ivalues, istart, istop, found)
+     ! Given the name of a dimension, return its (integer) values in <ivalues>
+     ! If <istart> and <istop> are present, they are the beginning and ending
+     ! indices of the dimension values to return in <ivalues>. By default,
+     ! the entire array is copied.
+     ! If <found> is passed, return .true. if <name> is a defined dimension
+     !       with integer values.
+
+     ! Dummy arguments
+     character(len=*),  intent(in)  :: name
+     integer,           intent(out) :: ivalues(:)
+     integer, optional, intent(in)  :: istart
+     integer, optional, intent(in)  :: istop
+     logical, optional, intent(out) :: found
+     ! Local variables
+     integer :: indx, jndx, rndx
+     integer :: ibeg
+     integer :: iend
+     logical :: dim_ok
+     integer, parameter  :: unset_i = huge(1)
+     character(len=*), parameter  :: subname = 'hist_dimension_values_int'
+
+     dim_ok = .false.
+     ivalues(:) = unset_i
+
+     do indx = 1, registeredmdims
+        if(trim(name) == trim(hist_coords(indx)%name)) then
+           dim_ok = associated(hist_coords(indx)%integer_values)
+           if (dim_ok) then
+              if (present(istart)) then
+                 ibeg = istart
+                 if (ibeg < LBOUND(hist_coords(indx)%integer_values, 1)) then
+                    call endrun(subname//": istart is outside the bounds")
+                 end if
+              else
+                 ibeg = LBOUND(hist_coords(indx)%integer_values, 1)
+              end if
+              if (present(istop)) then
+                 iend = istop
+                 if (iend > UBOUND(hist_coords(indx)%integer_values, 1)) then
+                    call endrun(subname//": istop is outside the bounds")
+                 end if
+              else
+                 iend = UBOUND(hist_coords(indx)%integer_values, 1)
+              end if
+              if (SIZE(ivalues) < (iend - ibeg + 1)) then
+                 call endrun(subname//": ivalues too small")
+              end if
+              rndx = 1
+              do jndx = ibeg, iend
+                 ivalues(rndx) = hist_coords(indx)%integer_values(jndx)
+                 rndx = rndx + 1
+              end do
+           end if
+           exit
+        end if
+     end do
+     if (present(found)) then
+        found = dim_ok
+     end if
+
+  end subroutine hist_dimension_values_int
+
+  !#######################################################################
+
 end module cam_history_support

src/cpl/nuopc/atm_comp_nuopc.F90

@@ -1485,6 +1485,7 @@ subroutine cam_orbital_update(clock, logunit,  mastertask, eccen, obliqr, lambm0
     integer           :: year     ! model year at current time
     integer           :: orb_year ! orbital year for current orbital computation
     character(len=CL) :: msgstr   ! temporary
+    logical, save     :: logprint = .true.
     character(len=*) , parameter :: subname = "(cam_orbital_update)"
     !-------------------------------------------
 
@@ -1499,10 +1500,14 @@ subroutine cam_orbital_update(clock, logunit,  mastertask, eccen, obliqr, lambm0
     else
        orb_year = orb_iyear
     end if
-
+    if(.not. (logprint .and. mastertask)) then
+       logprint = .false.
+    endif
+
     eccen = orb_eccen
-    call shr_orb_params(orb_year, eccen, orb_obliq, orb_mvelp, obliqr, lambm0, mvelpp, mastertask)
 
+    call shr_orb_params(orb_year, eccen, orb_obliq, orb_mvelp, obliqr, lambm0, mvelpp, logprint)
+    logprint = .false.
     if ( eccen  == SHR_ORB_UNDEF_REAL .or. obliqr == SHR_ORB_UNDEF_REAL .or. &
          mvelpp == SHR_ORB_UNDEF_REAL .or. lambm0 == SHR_ORB_UNDEF_REAL) then
        write (msgstr, *) subname//' ERROR: orb params incorrect'

src/physics/cam/micro_pumas_cam.F90

@@ -1324,7 +1324,13 @@ subroutine micro_pumas_cam_init(pbuf2d)
       call pbuf_set_field(pbuf2d, bergso_idx, 0._r8)
       call pbuf_set_field(pbuf2d, icswp_idx, 0._r8)
       call pbuf_set_field(pbuf2d, cldfsnow_idx, 0._r8)
+      call pbuf_set_field(pbuf2d, dei_idx,     0.0_r8)
+      call pbuf_set_field(pbuf2d, des_idx,     0.0_r8)
+      call pbuf_set_field(pbuf2d, mu_idx,     0.0_r8)
+      call pbuf_set_field(pbuf2d, lambdac_idx, 0.0_r8)
 
+      if (degrau_idx > 0) call pbuf_set_field(pbuf2d, degrau_idx, 0.0_r8)
+      if (icgrauwp_idx > 0) call pbuf_set_field(pbuf2d, icgrauwp_idx, 0.0_r8)
       if (qrain_idx > 0)   call pbuf_set_field(pbuf2d, qrain_idx, 0._r8)
       if (qsnow_idx > 0)   call pbuf_set_field(pbuf2d, qsnow_idx, 0._r8)
       if (nrain_idx > 0)   call pbuf_set_field(pbuf2d, nrain_idx, 0._r8)