Merge RAMS V6.3.04 code changes into INCUS prod

.gitignore

@@ -17,13 +17,27 @@
 *.grb1
 *.grb2
 dp-p[0-9]*
+
 bin.block/example_modis_sst/*
 bin.block/example_reynolds_sst/*
+bin.block/mk-blkfiles*
+bin.block/CreateSSTblockfiles.sc
+bin.block/run_test_sstfiles.sc
+
 bin.dp.grib1/example_data/*
+bin.dp.grib1/dgrib*
+bin.dp.grib1/rams_wgrib
+
 bin.dp.grib2/example_data/*
-bin.revu/example_data/*
 bin.dp.grib2/wgrib*
+bin.dp.grib2/dgrib*
+
+bin.revu/example_data/*
+bin.revu/revu*
+
 bin.rams/dprep.test/*
+bin.rams/rams*
+bin.rams/cleanup.sc
 
 # Ignore external libraries
 misc/*

bin.block/Makefile

@@ -0,0 +1,74 @@
+#Makefile
+###############################################################################
+# Include definitions
+###############################################################################
+include ../include.mk
+###############################################################################
+# Compiler commands
+###############################################################################
+INCLUDES  = $(UTILS_INCS) $(PAR_INCS) $(HDF5_INCS)
+F_CD1 = $(F_COMP) -c $(F_OPTS1) $(INCLUDES)
+F_CD2 = $(F_COMP) -c $(F_OPTS2) $(INCLUDES)
+C_CD  = $(C_COMP) -c $(C_OPTS)  $(INCLUDES) $(PAR_DEFS) $(HDF5_DEFS)
+
+C_CM =$(C_CD)  -D$(CMACH) $< && $(ARCH) $@ $(<F:.c=.o)   && rm -f $(<F:.c=.o)
+F_CM1=$(F_CD1) $<            && $(ARCH) $@ $(<F:.f90=.o) && rm -f $(<F:.f90=.o)
+F_CM2=$(F_CD2) $<            && $(ARCH) $@ $(<F:.f90=.o) && rm -f $(<F:.f90=.o)
+F_CM3=$(F_CD2) -D$(CMACH) $< && $(ARCH) $@ $(<F:.F90=.o) && rm -f $(<F:.F90=.o)
+
+################################################################################
+## File extension rules
+################################################################################
+$(ARC)(%.o): %.f90; $(F_CM2)
+
+$(ARC)(%.o): %.F90; $(F_CM3)
+
+$(ARC)(%.o): %.c;   $(C_CM)
+
+################################################################################
+# Define objects
+################################################################################
+OBJ = $(ARC)($(MODEL)/block/hdf5_f2c.o)  \
+      $(ARC)($(MODEL)/block/hdf5_utils.o) \
+      $(ARC)($(MODEL)/lib/rget.o)
+
+###############################################################################
+# Define archive and executable names
+###############################################################################
+BASE=mk-blkfiles
+EXE=$(BASE)-$(RAMS_VERSION)
+ARC=$(BASE)-$(RAMS_VERSION).a
+
+# Define main source.
+MAIN_OBJ = ./mk_main.o
+MAIN = $(MODEL)/block/mk_main.f90
+
+# Define targets.
+all: $(EXE)
+
+$(EXE): $(ARC) $(MAIN) FORCE
+	@echo ""
+	$(F_COMP) -o $(EXE) $(MAIN_OBJ) $(LOADER_OPTS) $(ARC) \
+	$(HDF5_LIBS) $(LIBS) $(PAR_LIBS)
+	rm -f *.o
+	@echo ""
+	@echo Finished building === $(EXE)
+	@echo ""
+
+$(MAIN): FORCE
+	@echo ""
+	$(F_CD2) $@
+
+$(ARC): $(OBJ)
+
+FORCE:
+
+check: FORCE
+	@echo ""
+	check
+
+clean:
+	@echo ""
+	rm -f $(ARC) $(EXE) $(BASE) *.o *.mod *.f
+	@echo ""
+

bin.dp.grib1/Makefile

@@ -1,6 +1,6 @@
-#Makefile 
+#Makefile
 ###############################################################################
-# Include definitions 
+# Include definitions
 ###############################################################################
 include ../include.mk
 ###############################################################################
@@ -51,7 +51,8 @@ rams_wgrib:
 
 $(EXE): $(ARC) $(MAIN) FORCE
 	@echo ""
-	$(F_COMP) -o $(EXE) $(MAIN_OBJ) $(LOADER_OPTS) $(ARC)
+	$(F_COMP) -o $(EXE) $(MAIN_OBJ) $(LOADER_OPTS) $(ARC) \
+	#$(HDF5_LIBS) $(LIBS) $(PAR_LIBS)
 	rm -f *.o
 	@echo ""
 	@echo Finished building === $(EXE)

bin.dp.grib1/README.txt

@@ -6,8 +6,8 @@
 3. Not all Grib reanalysis and forecast gridded datasets are accounted for. 
 
    You can view the degribbing code in the files such as:
-     src/6.2.11/dprep/dgrib1_main.f90   and
-     src/6.2.11/lib/griber_grb1.c
+     src/dprep/dgrib1_main.f90   and
+     src/lib/griber_grb1.c
 
    In these routines are the specfications for adding a new dataset. Grib
    names and numbers and labels can vary among datasets and each variation

bin.dp.grib1/run_dgrib_era5.sh

@@ -25,7 +25,7 @@ do
         # -d specifies the input date to pull from the file
         # -t 6 specifies to use ERA5 with specific humidity
         # -f specifies in the input grid file
-        ./dgrib-6.3.02 -t 6 -d $YEAR$MONTH$day$hour -h 0 -f $IN_FILE
+        ./dgrib-6.3.04 -t 6 -d $YEAR$MONTH$day$hour -h 0 -f $IN_FILE
         mv dp-p$YEAR-$MONTH-$day-"$hour"00* $OUT_DIR
     done
 done

bin.dp.grib2/Makefile

@@ -1,6 +1,7 @@
-#Makefile 
+#Makefile
+
 ###############################################################################
-# Include definitions 
+# Include definitions
 ###############################################################################
 include ../include.mk
 ###############################################################################
@@ -52,7 +53,8 @@ wgrib2:
 
 $(EXE): $(ARC) $(MAIN) FORCE
 	@echo ""
-	$(F_COMP) -o $(EXE) $(MAIN_OBJ) $(LOADER_OPTS) $(ARC)
+	$(F_COMP) -o $(EXE) $(MAIN_OBJ) $(LOADER_OPTS) $(ARC) \
+	$(HDF5_LIBS) $(LIBS) $(PAR_LIBS)
 	rm -f *.o
 	@echo ""
 	@echo Finished building === $(EXE)

bin.dp.grib2/README.txt

@@ -1,3 +1,9 @@
+Before compiling, you need a precompiled executable for "wgrib2".
+We have used version wgrib2 2.0.3 downloaded September 19, 2019.
+You will need to search for this software online and compile for your system.
+The executable name should be "wgrib2" and should be placed in this directory
+for the Makefile to find.
+
 1. Type "make" to compile after you have setup your ../include.mk file.
 
 2. Run sample executable like "dgrib-6.2.11" to see instructions on how to
@@ -6,9 +12,10 @@
 3. Not all Grib reanalysis and forecast gridded datasets are accounted for.
 
    You can view the degribbing code in the files such as:
-     src/6.2.11/dprep/dgrib2_main.f90   and
-     src/6.2.11/lib/griber_grb2.c
+     src/dprep/dgrib2_main.f90   and
+     src/lib/griber_grb2.c
 
    In these routines are the specfications for adding a new dataset. Grib
    names and numbers and labels can vary among datasets and each variation
    has to be customized as a new datatype.
+

bin.rams/RAMSIN.supercell → bin.rams/RAMSIN.testrunonly

@@ -184,7 +184,7 @@
 
 ! History start (if RUNTYPE='HISTORY')
 
-   HFILIN   = './test.supercell/a-A-1991-04-26-213000-head.txt',
+   HFILIN   = './testrun.output/a-A-1991-04-26-213000-head.txt',
                              ! Input state file name
 
 ! Analysis file input for assimilation: 1=yes, 0=no
@@ -198,7 +198,7 @@
 !  Analysis file output
 
    IOUTPUT  =  1,             ! 0-no files, 1-write files
-   AFILEPREF  = './test.supercell/a',  
+   AFILEPREF  = './testrun.output/a',  
                               ! File prefix for all analysis files
                               !   state,mean,lite,both
 
@@ -234,10 +234,10 @@
 
 ! Input topography variables
 
-   TOPFILES = './test.supercell/toph', ! Path and prefix for topo files. 
-   SFCFILES = './test.supercell/sfch', ! Path and prefix for surface files. 
-   SSTFPFX  = './test.supercell/ssth', ! Path and prefix for sst files
-   NDVIFPFX = './test.supercell/ndh',  ! Path and prefix for ndni files
+   TOPFILES = './testrun.output/toph', ! Path and prefix for topo files. 
+   SFCFILES = './testrun.output/sfch', ! Path and prefix for surface files. 
+   SSTFPFX  = './testrun.output/ssth', ! Path and prefix for sst files
+   NDVIFPFX = './testrun.output/ndh',  ! Path and prefix for ndni files
 
    ITOPTFLG = 2,0,0,0,           ! 2 - Fill data in "leaf3_init"
    ISSTFLG  = 2,2,0,0,           ! 0 - Interpolate from coarser grid
@@ -250,8 +250,8 @@
                               ! 1 - Update values during run
 
                              ! The following only apply for IxxxxFLG=1
-   ITOPTFN  = '../../sfctypehdf5/DEM30s-h5/EL',
-              '../../sfctypehdf5/DEM30s-h5/EL',
+   ITOPTFN  = '../../sfctypehdf5/gmted2010-h5/TM',
+              '../../sfctypehdf5/gmted2010-h5/TM',
    ISSTFN   = '../../sfctypehdf5/sst-h5/S',
               '../../sfctypehdf5/sst-h5/S',
    IVEGTFN  = '../../sfctypehdf5/ogedata-h5/GE',
@@ -293,6 +293,9 @@
    IBND     = 1,             ! Lateral boundary condition flags
    JBND     = 1,             ! 1-Klemp/Wilhelmson, 2-cyclic
 
+   ISPONGE_PTS = 0,5,5,       ! Number of nested grid boundary sponge points
+   SPONGE_TAU  = 0.,30.,30.,  ! Nested grid sponge zone time scale (seconds)
+
    CPHAS    = 30.,           ! Phase speed if IBND or JBND = 1
    LSFLG    = 1,             ! Large-scale gradient flag for variables other than
                              !  normal velocity:
@@ -321,7 +324,7 @@
 
 ! KPP mixed-layer single-column ocean model
 
-   IKPP       = 1,          ! Ocean model (0-off, 1-on, 2-more diagnostics)
+   IKPP       = 0,          ! Ocean model (0-off, 1-on, 2-more diagnostics)
    DMAXKPP    = 500.,       ! Maximum ocean depth (meters)
    NKPPZ      = 48,         ! Number of ocean layers (levels = layers+1)
    DSCALEKPP  = 3.,         ! Set exponential for stretched grid
@@ -374,7 +377,7 @@
    !  9  Tall grass                  ! 20  Wetland evergreen broadleaf tree
    ! 10  Semi-desert                 ! 21  Very urban
 
-   PCTLCON  = 0.7,            ! Constant land % if for all domain
+   PCTLCON  = 1.0,            ! Constant land % if for all domain
    NSLCON   = 6,              ! Constant soil type if for all domain
 
    !   1 -- sand             2 -- loamy sand      3 -- sandy loam
@@ -541,7 +544,7 @@
 
 ! Aerosol parameters         ! See mic_init.f90 for setting profiles
                              ! ------------------------------------------
-   IAEROSOL = 1,             ! CCN,GCCN: 0=off, 1=userset
+   IAEROSOL = 1,             ! CCN-1,CCN-2: 0=off, 1=userset
    ISALT    = 1,             ! Sea Salt: 0=off, 1=userset, 2=saltmodel
    IDUST    = 1,             ! Dust: 0=off, 1=userset 2=dustmodel
    IABCARB = 0,              ! Absorbing carbon: 0=off, 1=userset
@@ -586,14 +589,14 @@
                              ! 3 = Constant in the Boundary Layer, Linear Decreasing to Free Tropospheric Value,
                              !     then Linear Decrease to Model Top 
 
-   CCN_MAX    = 1000.,       ! CCN at surface (#/mg) 
    CCN_SH     = 7000.,       ! CCN exponential scale height (for ICCN_PROF = 1 or 2)
    BL_HGT     = 2000.,       ! Boundary layer height (m) - for CCN_PROF=2
    TRAN_DEPTH = 1000.,       ! Transition depth (linear) for BL -> FT ccn conc. (m) - for CCN_PROF=3
    CCN_FT     = 100.,        ! Free Tropospheric CCN Concentration - for CCN_PROF=3
    CIN_MAX    = 0.01,        ! Ice Nuclei (#/mg)
    CIN_SH     = 5000.,       ! Ice Nuclei expoential scale height (for IIFN = 1 or 2)
-   GCCN_MAX   = 0.01,        ! Giant-CCN (#/mg)
+   CCN1_MAX   = 1000.,       ! CCN-mode-1 (#/mg)
+   CCN2_MAX   = 0.01,        ! CCN-mode-2 (#/mg)
    DUST1_MAX  = 100.,        ! Small Dust Mode (#/mg)
    DUST2_MAX  = 10.,         ! Large Dust Mode (#/mg)
    SALTF_MAX  = 100.,        ! Film Sea Salt (#/mg)
@@ -609,7 +612,7 @@
    AERO_EPSILON = 0.90,0.90,0.05,0.05,1.00,1.00,1.00,0.05,0.05,0.20,0.20, 
 
    ! Aerosol 9 categories initial median radius (meters)
-   AERO_MEDRAD  = 0.04e-6,3.00e-6,          !CCN,GCCN
+   AERO_MEDRAD  = 0.04e-6,3.00e-6,          !CCN-1,CCN-2
                   0.05e-6,0.50e-6,          !Dust1,Dust2
                   0.10e-6,1.00e-6,6.00e-6,  !SeaSalt: film,jet,spume
                   0.05e-6,0.05e-6,          !Absorbing carbon

bin.rams/cleanup.sc

@@ -0,0 +1,3 @@
+#!/bin/bash
+rm -f *.mod rams rams*.a
+rm -fr testrun.output

bin.rams/machs

@@ -0,0 +1 @@
+floyd

bin.rams/machs.master

@@ -9,28 +9,8 @@
 #SINGLE MACHINE
 #`hostname`
 
-#Using "ccn" cluster with MPICH
-#node01:1
-#node02:8
-#node03:8
-#node04:8
-#node05:8
-#node06:8
-#node07:8
-#node08:8
-
-#Using "ccn" cluster with openMPI
-#node01 slots=1
-#node02 slots=8
-#node03 slots=8
-#node04 slots=8
-#node05 slots=8
-#node06 slots=8
-#node07 slots=8
-#node08 slots=8
-
 #Using "frost" cluster with MPICH
-#frost:1
+#frost:16
 #frost1:16
 #frost2:16
 #frost3:16
@@ -40,12 +20,18 @@
 #frost7:16
 #frost8:16
 
-#Using "ice" cluster (infiniband) MPICH
-#icehome_ib:8
-#ice1_ib:12
-#ice2_ib:12
-#ice3_ib:12
-#ice4_ib:12
+#Using "ice" cluster
+#ice:8
+#ice1:12
+#ice2:12
+#ice3:12
+#ice4:12
+
+#Using "snow" cluster
+#snow:1
+#snowfall1:64
+#snowfall2:64
+#snowfall3:64
 
 #Ciracluster (head node is cm00, but do not include that in list)
 #cc00:12