merge with other version

postproc/e3sm1p0/main_e3sm.sh

@@ -20,7 +20,9 @@ if [[ $(hostname -s) = rhea* ]]; then
 	year_start=1979
 	year_end=2005
 	base=/lustre/atlas1/$project/proj-shared/salil/archive
-	path=$base/$case/archive
+	prebase=/lustre/atlas1/$project/proj-shared/salil/archive/$case/archive
+#	path=$base/$case/archive
+	path=/lustre/atlas1/$project/world-shared/$USER/$case
 	outpath=/lustre/atlas1/$project/world-shared/$USER/$case/postproc
 # compute center settings
 	obspath=/lustre/atlas1/cli115/world-shared/4ue/obs_data
@@ -37,7 +39,8 @@ elif [[ $(hostname -s) = cori* ]]; then
 	year_start=0470
 	year_end=0498
 #need to specify prebase if using data created by someone else until masks are written with sim output
-#	prebase=/global/cscratch1/sd/golaz/ACME_simulations
+	prebase=/global/cscratch1/sd/golaz/ACME_simulations
+#	prebase=/global/cscratch1/sd/dcomeau/acme_scratch/edison/archive/$case
 	base=/global/cscratch1/sd/$USER/acme_scratch/edison
 	path=$base/$case
 	outpath=/global/cscratch1/sd/$USER/$case/postproc