edited comments, cleanup

GEOS-ESM · Jul 13, 2022 · 13b0b0c · 13b0b0c · saraqzhang · Jul 13, 2022
1 parent 4274beb
commit 13b0b0c
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 18 deletions.
diff --git a/src/Applications/LDAS_App/CMakeLists.txt b/src/Applications/LDAS_App/CMakeLists.txt
@@ -19,13 +19,24 @@ ecbuild_add_executable (
    SOURCES util/inputs/mwrtm_bin2nc4.F90
    LIBS GEOSlandassim_GridComp)
 
-install(
-   PROGRAMS ldas_setup process_hist.csh process_rst.csh ens_forcing/average_ensemble_forcing.py ens_forcing/ensemble_forc.py ens_forcing/regrid_forc.csh ens_forcing/enpert_forc.csh
+set (scripts
+   ldas_setup 
+   process_hist.csh 
+   process_rst.csh 
+   ens_forcing/average_ensemble_forcing.py 
+   ens_forcing/ensemble_forc.py 
+   ens_forcing/regrid_forc.csh 
+   ens_forcing/enpert_forc.csh
+   )
+
+install (
+   PROGRAMS ${scripts}
    DESTINATION bin
    )
 
-file(GLOB rc_files GEOSldas_*rc)
+file(GLOB rc_files  GEOSldas_*rc)
 file(GLOB nml_files LDASsa_DEFAULT*nml)
+
 install(
    FILES ${rc_files} ${nml_files} lenkf.j.template
    DESTINATION etc

diff --git a/src/Applications/LDAS_App/ens_forcing/enpert_forc.csh b/src/Applications/LDAS_App/ens_forcing/enpert_forc.csh
@@ -13,8 +13,8 @@
 # Requires environment variables: 
 #   ADAS_EXPDIR - path the ADAS experiment directory (ensemble of lfo files)
 #   GRID        - target grid of forcing files (typically that of deterministic ADAS simulation)
-#   NENS        - number of ensemble members (ensemble size, typically that of LDAS coupled to the deterministic ADAS) 
-#   GEOSBIN     - GEOSldas ROOTdir ( typically GEOSldas/install/bin ) 
+#   NENS        - number of (LDAS) ensemble members (<= number of ADAS ensemble members)
+#   GEOSBIN     - GEOSldas "ROOT" directory (typically GEOSldas/install/bin) 
 #
 # Input data sets:
 #   1. lfo files from coarse-resolution ADAS ensemble

diff --git a/src/Applications/LDAS_App/ens_forcing/test_enpert_forc.j b/src/Applications/LDAS_App/ens_forcing/test_enpert_forc.j
@@ -1,31 +1,39 @@
 #!/usr/bin/csh
+
+# sample script for testing "enpert_forc.csh"
+#
+# must edit paths before submitting this script
+#
+# -----------------------------------------------------------
+
 #SBATCH --ntasks=1
 #SBATCH --time=1:00:00
-#SBATCH --job-name=regd
-#SBATCH --output=/discover/nobackup/user/test/test.o%j.txt
+#SBATCH --job-name=test_enpert_forc
+#SBATCH --output=/discover/nobackup/[USER]/test_enpert_forc.o%j.txt
 #SBATCH --export=NONE
 #SBATCH --qos=debug
 
-########################################################
-## user:   user
-## GEOSldas: GEOSldas ROOTdir 
-## testdir:  user testdir
-## GEOSadas: GEOSadas ROOTdir 
-########################################################
+# set environment variables needed by enpert_forc.csh
+
+setenv GEOSBIN     /discover/nobackup/[USER]/GEOSldas/install/bin  
+setenv ADAS_EXPDIR /discover/nobackup/[USER]/GEOSadas 
+setenv NENS        24  
+setenv GRID        PE180x1080-CF
+
+# load modules
 
-setenv  GEOSBIN /discover/nobackup/user/GEOSldas/install/bin  
 source $GEOSBIN/g5_modules
+
 module load python/GEOSpyD/Ana2019.03_py3.7
+
 if ( -e /etc/os-release ) then
   module load nco/4.8.1
 else
   module load other/nco-4.6.8-gcc-5.3-sp3
 endif
 
-setenv RUNDIR /discover/nobackup/user/testdir/ 
-setenv ADAS_EXPDIR /discover/nobackup/user/GEOSadas 
-setenv NENS 24  
-setenv GRID PE180x1080-CF
+# execute test
 
 $GEOSBIN/enpert_forc.csh 
 
+# ====================== EOF ===================================