From 9bfed56c676357e6aae3816508d2bb6dc09f2df5 Mon Sep 17 00:00:00 2001
From: "Patrick.C.Campbell@noaa.gov" <Patrick.C.Campbell@m72a2.ncep.noaa.gov>
Date: Sat, 27 Jun 2020 01:36:48 +0000
Subject: [PATCH] Updated Fengsha write variables for NACC.

---
 parallel/scripts/run-nacc-fv3.ksh |  8 +++----
 parallel/src/alloc_ctm.f90        | 35 +++++++++++++++----------------
 serial/src/alloc_ctm.f90          | 11 +++++-----
 3 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/parallel/scripts/run-nacc-fv3.ksh b/parallel/scripts/run-nacc-fv3.ksh
index 954d303..24f62b3 100755
--- a/parallel/scripts/run-nacc-fv3.ksh
+++ b/parallel/scripts/run-nacc-fv3.ksh
@@ -22,9 +22,9 @@ NTIMES=73
 export NODES=12
 
 APPL=aqm.t12z
-InMetDir=/gpfs/hps2/ptmp/$USER/fv3gfs_v16_test/12z_hourly
+InMetDir=/gpfs/hps2/ptmp/$USER/NACC-Fengsha-Test
 InGeoDir=$InMetDir
-OutDir=/gpfs/hps2/ptmp/$USER/fv3gfs_v16_test/output
+OutDir=/gpfs/hps2/ptmp/$USER/NACC-Fengsha-Test/output
 ProgDir=/gpfs/hps3/emc/naqfc/noscrub/Patrick.C.Campbell/NACC/parallel/src
 
 if [ ! -s $InMetDir ]; then
@@ -70,8 +70,8 @@ cat>namelist.mcip<<!
   lpv        =  0
   lwout      =  1
   luvbout    =  1
-  mcip_start = "2019-07-12-12:00:00.0000"
-  mcip_end   = "2019-07-15-13:00:00.0000"
+  mcip_start = "2019-07-22-12:00:00.0000"
+  mcip_end   = "2019-07-25-13:00:00.0000"
   intvl      =  60
   coordnam   = "FV3_RPO"
   grdnam     = "FV3_CONUS"
diff --git a/parallel/src/alloc_ctm.f90 b/parallel/src/alloc_ctm.f90
index f8ee8c3..9f3a833 100644
--- a/parallel/src/alloc_ctm.f90
+++ b/parallel/src/alloc_ctm.f90
@@ -209,7 +209,7 @@ SUBROUTINE alloc_ctm
     npxwrf41 = 0
   ENDIF
 
-  nfld2dxyt = 29 + nwr + nsoil2d + npxwrf41
+  nfld2dxyt = 33 + nwr + nsoil2d + npxwrf41
 
   ALLOCATE ( fld2dxyt ( nfld2dxyt ) )
 
@@ -246,33 +246,32 @@ SUBROUTINE alloc_ctm
   c_lai      => fld2dxyt(27)
   c_seaice   => fld2dxyt(28)
   c_snowh    => fld2dxyt(29)
+  c_clayf    => fld2dxyt(30)
+  c_sandf    => fld2dxyt(31)
+  c_drag     => fld2dxyt(32)
+  c_ssm      => fld2dxyt(33)
 
   IF ( ifwr ) THEN
-    c_wr => fld2dxyt(29+nwr)
+    c_wr => fld2dxyt(33+nwr)
   ENDIF
 
   IF ( ifsoil ) THEN
-    c_soim1 => fld2dxyt(29+nwr+1)
-    c_soim2 => fld2dxyt(29+nwr+2)
-    c_soit1 => fld2dxyt(29+nwr+3)
-    c_soit2 => fld2dxyt(29+nwr+4)
-    c_sltyp => fld2dxyt(29+nwr+5)
+    c_soim1 => fld2dxyt(33+nwr+1)
+    c_soim2 => fld2dxyt(33+nwr+2)
+    c_soit1 => fld2dxyt(33+nwr+3)
+    c_soit2 => fld2dxyt(33+nwr+4)
+    c_sltyp => fld2dxyt(33+nwr+5)
   ENDIF
 
   IF ( ifpxwrf41 ) THEN
-    c_wsat_px   => fld2dxyt(29+nwr+nsoil2d+1)
-    c_wfc_px    => fld2dxyt(29+nwr+nsoil2d+2)
-    c_wwlt_px   => fld2dxyt(29+nwr+nsoil2d+3)
-    c_csand_px  => fld2dxyt(29+nwr+nsoil2d+4)
-    c_fmsand_px => fld2dxyt(29+nwr+nsoil2d+5)
-    c_clay_px   => fld2dxyt(29+nwr+nsoil2d+6)
+    c_wsat_px   => fld2dxyt(33+nwr+nsoil2d+1)
+    c_wfc_px    => fld2dxyt(33+nwr+nsoil2d+2)
+    c_wwlt_px   => fld2dxyt(33+nwr+nsoil2d+3)
+    c_csand_px  => fld2dxyt(33+nwr+nsoil2d+4)
+    c_fmsand_px => fld2dxyt(33+nwr+nsoil2d+5)
+    c_clay_px   => fld2dxyt(33+nwr+nsoil2d+6)
   ENDIF
 
-  c_clayf      => fld2dxyt(30)
-  c_sandf      => fld2dxyt(31)
-  c_drag       => fld2dxyt(32)
-  c_ssm        => fld2dxyt(33)
-
 !-------------------------------------------------------------------------------
 ! Time-varying 3d fields at cell centers.
 !-------------------------------------------------------------------------------
diff --git a/serial/src/alloc_ctm.f90 b/serial/src/alloc_ctm.f90
index f8ee8c3..769a5f6 100644
--- a/serial/src/alloc_ctm.f90
+++ b/serial/src/alloc_ctm.f90
@@ -209,7 +209,7 @@ SUBROUTINE alloc_ctm
     npxwrf41 = 0
   ENDIF
 
-  nfld2dxyt = 29 + nwr + nsoil2d + npxwrf41
+  nfld2dxyt = 33 + nwr + nsoil2d + npxwrf41
 
   ALLOCATE ( fld2dxyt ( nfld2dxyt ) )
 
@@ -246,6 +246,10 @@ SUBROUTINE alloc_ctm
   c_lai      => fld2dxyt(27)
   c_seaice   => fld2dxyt(28)
   c_snowh    => fld2dxyt(29)
+  c_clayf    => fld2dxyt(30)
+  c_sandf    => fld2dxyt(31)
+  c_drag     => fld2dxyt(32)
+  c_ssm      => fld2dxyt(33)
 
   IF ( ifwr ) THEN
     c_wr => fld2dxyt(29+nwr)
@@ -268,11 +272,6 @@ SUBROUTINE alloc_ctm
     c_clay_px   => fld2dxyt(29+nwr+nsoil2d+6)
   ENDIF
 
-  c_clayf      => fld2dxyt(30)
-  c_sandf      => fld2dxyt(31)
-  c_drag       => fld2dxyt(32)
-  c_ssm        => fld2dxyt(33)
-
 !-------------------------------------------------------------------------------
 ! Time-varying 3d fields at cell centers.
 !-------------------------------------------------------------------------------