Develop

.gitignore

@@ -1,4 +1,4 @@
 *.o
 *.mod
 *.a
-prms/prms
+prms/prms

Makefile

@@ -3,22 +3,52 @@
 #
 # Top-level makefile for the PRMS
 #
+#-------------------------------------------------------------------
+# $Id: Makefile
+#-------------------------------------------------------------------
 
 include ./makelist
 
 #
 # Standard Targets for Users
 #
 
-all: standard
+all: prmsglrip prmsgl
 
-standard:
+prmsglrip:
+# Create lib directory, if necessary
+	@if [ ! -d $(MMFDIR) ]   ; then        \
+	  mkdir $(MMFDIR) ;                   \
+	  echo  Created directory $(MMFDIR) ; \
+	fi
+# Create bin directory, if necessary
+	@if [ ! -d $(BINDIR) ]   ; then        \
+	  mkdir $(BINDIR) ;                   \
+	  echo  Created directory $(BINDIR) ; \
+	fi
 	cd $(MMFDIR); $(MAKE);
-	cd $(MIZU); $(MAKE);
+	cd $(MIZUDIR); $(MAKE);
+	cd $(PRMSRDIR); $(MAKE);
+
+prmsgl:
+# Create lib directory, if necessary
+	@if [ ! -d $(MMFDIR) ]   ; then        \
+	  mkdir $(MMFDIR) ;                   \
+	  echo  Created directory $(MMFDIR) ; \
+	fi
+# Create bin directory, if necessary
+	@if [ ! -d $(BINDIR) ]   ; then        \
+	  mkdir $(BINDIR) ;                   \
+	  echo  Created directory $(BINDIR) ; \
+	fi
+	cd $(MMFDIR); $(MAKE);
+	cd $(MIZUDIR); $(MAKE);
 	cd $(PRMSDIR); $(MAKE);
 
+
 clean:
 	cd $(MMFDIR); $(MAKE) clean;
-	cd $(MIZU); $(MAKE); clean;
+	cd $(MIZUDIR); $(MAKE) clean;
 	cd $(PRMSDIR); $(MAKE) clean;
-
+	cd $(PRMSRDIR); $(MAKE) clean;
+	$(RM) $(BINDIR)/prms*

README.md

@@ -1,2 +1,114 @@
 # prms
 Precipitation Runoff Modeling System
+This fork makes two executables when doing 'make'. The executable /bin/prms will have capabilities of turning on the glacier_flag, the stream_temp_flag, the frozen_flag (that uses the old CFGI with no frozen depth just binary frozen state), and using the strmflow_module muskingum, muskingum_mann, or mizuroute. The  executable /bin/prmsrip will have capabilities of turning on the glacier_flag, the stream_temp_flag, the frozen_flag (that uses the new CFGImod with frozen depth), the ripst_flag, and using the strmflow_module muskingum, muskingum_mann, or mizuroute. 
+
+
+
+Glacier params, calculate:
+
+abl_elev_range-- from RGI == Randolph Glacier Inventory and modify, /Roland has code
+glacier_frac_init-- from RGI /Roland has code
+glrette_frac_init-- from RGI, fraction of HRU that is small glacier and not delineated into special glacier HRU /Roland has code
+hru_length--geometric map tools/Roland has code
+hru_width--geometric map tools/Roland has code
+tohru--from glacier HRU delineation/Roland has code
+(Note, some standard PRMS params change on glaciers, like hru_type =4 on all possible to be glacierized HRUs). Roland's code figured out all this
+
+
+
+Glacier params, defaults, could calibrate some of these (I did in the Copper paper):
+
+albedo_coef
+albedo_ice
+glacr_freeh2o_cap
+glacr_layer
+glacrva_coef-- will go away if update code with Delta h area change and then might add some
+glacrva_exp-- will go away if update code with Delta h area change and then might add some
+max_gldepth
+stor_firn
+stor_ice
+stor_snow
+
+
+
+Routing params calculate:
+
+mann_n-- can be from slope if nothing better, that is the method in CONUS and then we calibrate
+seg_slope-- DEM
+Muskingum: seg_depth-- from regression models or? I got it from a paper in CONUS 
+Dynamic: seg_width-- from regression models or NARwidth of ? I got it from a paper in CONUS for the streams smaller than 30 m wide, big is NARwidths
+seg_length-- DEM? needs to be length including the vertical drop
+(does not use K_coef)
+
+
+
+Frozen ground params, defaults, can calibrate to permafrost probability maps:
+
+cfgi_decay -- calibrate this maybe
+cfgi_thrshld-- calibrate this definitely
+porosity_hru-- soils data porosity
+soil_depth-- Unified North American Soil Map? STATSGO?
+soil_den --Unified North American Soil Map? STATSGO?
+
+
+
+Riparian needs all the new routing params (besides seg_length) and:
+calculate:
+
+porosity_seg-- soils data porosity
+ripst_areafr_max-- riparian area data gives fraction of HRU riparian
+specyield_seg-- might be data on this somewhere, haven't got it for CONUS yet but default is perhaps close enough
+transmiss_seg-- soils data transmissivity
+
+
+
+Riparian defaults, most of these have no good reason to calibrate:
+
+bankfinite_hru
+bankst_head_init
+ripst_et_coef
+ripst_frac_init
+tr_ratio
+bank_height_fac -- calibrate this or at least think about what want, it's 20 right now
+
+
+
+Stream Temp calculate: 
+
+seg_elev-- DEM
+seg_lat-- DEM
+width_m-- relate to seg_width somehow?
+
+
+
+Stream Temp, I'd leave these at defaults ... ask Markstrom:
+
+albedo 
+alte 
+altw
+azrh
+gw_tau
+lat_temp_adj
+maxiter_sntemp
+melt_temp
+ss_tau
+vce
+vcw
+vdemn
+vdemx
+vdwmn
+vdwmx
+vdwmx
+vhe
+vhw
+voe
+vow
+width_alpha
+
+
+
+Calving glacier params calculate:
+NOTE: currently this isn't going to get put in so you can ignore (there are calving parameters needed for MWBMglacier now)
+
+ocean_depth -- offshore DEM at end of calving front, current idea is to set up offshore HRUs that contain the glacier tongue area and have properties
+(these glaciers will have tohrus that then will be possible to tell that the upstream glacier part feeds a calving front, as long as tongue calculated to float)

makelist

@@ -2,55 +2,62 @@
 #-------------------------------------------------------------------
 #-------------------------------------------------------------------
 
-MMFDIR      = ./mmf
-PRMSDIR     = ./prms
-BINDIR      = ../bin
-MMFLIB      = .$(MMFDIR)/libmmf.a
+F_MASTER    = /Users/amedin/Research/NHM_dev
+MMFDIR      = $(F_MASTER)/mmf
+MIZUDIR     = $(F_MASTER)/mizu
+LIBDIR      = $(F_MASTER)/lib
+PRMSDIR     = $(F_MASTER)/prms
+PRMSRDIR    = $(F_MASTER)/prmsRip
+BINDIR      = $(F_MASTER)/bin
+MMFLIB      = $(LIBDIR)/libmmf.a
+MIZULIB     = $(LIBDIR)/libmizu.a
+INCMIZU     = -I$(MIZUDIR)/include
 
 #########################################################
 # Configure tags for each system
 ##########################################################
-ARC		= LINUX
+ARC		= UNIX
+#ARC		= LINUX
 #ARC		= WINDOWS
 
 #OPTLEVEL	= -g
 OPTLEVEL	= -O -Bstatic
 #for gfortran
-#LDFLAGS	=$(OPTLEVEL)
+LDFLAGS		=$(OPTLEVEL)
 #for ifort
-LDFLAGS		=$(OPTLEVEL) -nofor_main
+#LDFLAGS	=$(OPTLEVEL) -nofor_main
+MFLAGS          = -ffree-line-length-none
 
 ##########################################################
 # Define the Fortran compile flags
 ##########################################################
 #for gfortran
-#FFLAGS= $(OPTLEVEL) -fbounds-check -fno-second-underscore -Wall
+FFLAGS= $(OPTLEVEL) -fbounds-check -Wall -fno-second-underscore $(MFLAGS)
 #FFLAGS= $(OPTLEVEL) -fno-second-underscore
+FC		= gfortran
 #for ifort
 #FFLAGS= $(OPTLEVEL) -warn all -fltconsistency
-FFLAGS= $(OPTLEVEL) -fp-model source
-#FC		= gfortran
-FC		= ifort
+#FFLAGS= $(OPTLEVEL) -fp-model source
+#FC		= ifort
 
 ##########################################################
 # Define the C compile flags
 # -D_UF defines UNIX naming conventions for mixed language compilation.
 ##########################################################
-CFLAGS		= $(OPTLEVEL) -D$(ARC) -D_UF -Wall
+CFLAGS		= $(OPTLEVEL) -D$(ARC) -D_UF -I /usr/include
 #for gfortran
-#CC		= gcc
+CC		= gcc
 #for ifort
-CC		= icc
+#CC		= icc
 
 ##########################################################
 # Define the libraries
 ##########################################################
 #for gfortran
-#MATHLIB		= -lm
-#GCLIB		= -lgfortran -lgcc $(MATHLIB)
+MATHLIB		= -lm
+GCLIB           = -L/opt/local/lib -lgfortran -lgcc_s.1 -L/usr/lib
 #for ifort
-MATHLIB		= 
-GCLIB		= 
+#GCLIB		= -lgfortran -lgcc $(MATHLIB)
 FLIBS    = $(GCLIB)
 
 ##########################################################

prms/call_modules.f90

@@ -8,7 +8,7 @@ MODULE PRMS_MODULE
       CHARACTER(LEN=68), PARAMETER :: &
      &  EQULS = '===================================================================='
       CHARACTER(LEN=12), PARAMETER :: MODNAME = 'call_modules'
-      CHARACTER(LEN=24), PARAMETER :: PRMS_VERSION = 'Version 5.0.1 06/20/2019'
+      CHARACTER(LEN=24), PARAMETER :: PRMS_VERSION = 'Version 5.1.0 RC'
       CHARACTER(LEN=8), SAVE :: Process
       CHARACTER(LEN=80), SAVE :: PRMS_versn
       INTEGER, SAVE :: Model, Process_flag, Call_cascade, Ncascade, Ncascdgw

prms/climateflow.f90

@@ -542,17 +542,17 @@ INTEGER FUNCTION climateflow_decl()
       IF ( Glacier_flag==1 .OR. Model==99 ) THEN
         ALLOCATE ( Glacier_frac(Nhru) )
         IF ( declvar(MODNAME, 'glacier_frac', 'nhru', Nhru, 'real',       &
-             'Fraction of glaciation (0=none; 1=100%)',                   &
+             'Fraction of glaciation (0=none; 1=100%) in glacier-capable HRU',                   &
              'decimal fraction', Glacier_frac)/=0 ) CALL read_error(3, 'glacier_frac')
 
         ALLOCATE ( Glrette_frac(Nhru) )
           IF ( declvar(MODNAME, 'glrette_frac', 'nhru', Nhru, 'real',     &
-             'Fraction of snow field (too small for glacier dynamics)',   &
+             'Fraction of glacierette (too small for glacier dynamics)',   &
              'decimal fraction', Glrette_frac)/=0 )  CALL read_error(3, 'glrette_frac')
 
         ALLOCATE ( Alt_above_ela(Nhru) )
         IF ( declvar(MODNAME, 'alt_above_ela', 'nhru', Nhru, 'real',      &
-             'Altitude above equilibrium line altitude (ELA)',            &
+             'Altitude HRU is above equilibrium line altitude (ELA), negative value indicates HRU below ELA',            &
              'elev_units', Alt_above_ela)/=0 ) CALL read_error(3, 'alt_above_ela')
       ENDIF