Merge branch 'main' into derecho-cce

.readthedocs.yaml

@@ -0,0 +1,10 @@
+# .readthedocs.yaml
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+version: 2
+
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.11"

CHANGELOG.rst

@@ -22,6 +22,17 @@ individual files.
 
 The changes are now listed with the most recent at the top.
 
+**May 10 2023 :: Doc-fix. Tag v10.7.2**
+
+- conf.py changes for latest readthedocs. Fixes search and flyout menu.
+
+**May 8 2023 :: CLM-DART: CAM reanalysis site-level bias correction tool. Tag v10.7.1**
+
+- Initial version of bias correction for CAM reanalysis forcing for
+  site-level assimilation with CLM-DART.
+- mkmf change: make clean removes .mod files.
+- bug-fix: readthedocs yaml file for online documentation build.
+
 **April 21 2023 :: MOM6. Tag v10.7.0**  
 
 - CESM-MOM6 interface added to DART.

build_templates/mkmf

@@ -473,7 +473,7 @@ my $noff = scalar keys %off_sources;
 &print_formatted_list( "OFF =", keys %off_sources ) if $noff > 0;
 
 #write targets
-print MAKEFILE "clean: neat\n\t-rm -f .cppdefs \$(OBJ) $opt_p\n";
+print MAKEFILE "clean: neat\n\t-rm -f .cppdefs *.mod \$(OBJ) $opt_p\n";
 print MAKEFILE "neat:\n\t-rm -f \$(TMPFILES)\n";
 print MAKEFILE "localize: \$(OFF)\n\tcp \$(OFF) .\n" if $noff > 0;
 print MAKEFILE "TAGS: \$(SRC)\n\tetags \$(SRC)\n";

conf.py

@@ -21,7 +21,7 @@
 author = 'Data Assimilation Research Section'
 
 # The full version, including alpha/beta/rc tags
-release = '10.7.0'
+release = '10.7.2'
 master_doc = 'README'
 
 # -- General configuration ---------------------------------------------------
@@ -30,6 +30,7 @@
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
 extensions = [
+     'sphinx_rtd_theme',
      'sphinx.ext.autodoc',
      'sphinx.ext.mathjax'
 ]

models/clm/CAM_bias_correction/CAM4_site_grid.sh

@@ -0,0 +1,52 @@
+#!/bin/bash
+
+# Extracts site level grid cell from CAM4 reanalysis
+
+# CAM4 reanalysis
+CAM4_grid_path="/glade/collections/rda/data/ds199.1/"
+# Site Level grid cell from CAM4 renanalysis
+CAM4_site_path="/glade/work/bmraczka/CAM4_NR1/"
+
+# The US-NR1 flux tower site is used as an example 
+# NR1 location (40.03, -105.55) or (40.03, 254.45)
+# CAM4 grid is 1.95x2.5  or 288 longitude grid points and 96 latitude grid points
+# This lat/lon corresponds with doma_lon= 102 (255 degrees east) ; doma_lat= 69  ; (40.7368 degrees)
+
+
+for YEAR in {1997..2010..1}
+
+do
+
+   echo "  "
+   echo "entering YEAR loop where value of YEAR is:"
+   echo ${YEAR}
+   echo "  "
+   for NINST in {0001..0080..1}  # Will create 0001, 0002, ... 0080
+   do
+      echo "  "
+      echo "entering NINST loop where value of YEAR is:"
+      echo ${NINST}
+      echo "  "  
+
+      #Create output directory if necessary
+      OUTDIR=${CAM4_site_path}${NINST}
+      if [[ ! -d ${OUTDIR} ]] ; then
+           mkdir ${OUTDIR}
+      fi
+
+
+      ncks -d doma_nx,102,102 -d doma_ny,69,69 -d a2x6h_nx,102,102 -d a2x6h_ny,69,69 \
+            ${CAM4_grid_path}/CAM_DATM.cpl_${NINST}.ha2x1dx6h.${YEAR}.nc \
+            ${CAM4_site_path}${NINST}/CAM4_NR1.cpl_${NINST}.ha2x1dx6h.${YEAR}.nc
+
+      echo "  "
+      echo "Completed CAM4 NR1 extract"
+      echo "  "
+
+   done
+done
+
+
+exit 0
+
+