From 90578aa1cf07985ab02a9cc5dc172d6923723333 Mon Sep 17 00:00:00 2001 From: biljanaorescanin Date: Thu, 2 Feb 2023 11:19:13 -0500 Subject: [PATCH 1/4] remove fpar scaling --- gcm_forecast.tmpl | 1 - gcm_run.j | 1 - 2 files changed, 2 deletions(-) diff --git a/gcm_forecast.tmpl b/gcm_forecast.tmpl index 55aca084..7356d8fd 100755 --- a/gcm_forecast.tmpl +++ b/gcm_forecast.tmpl @@ -425,7 +425,6 @@ cat << _EOF_ > $FILE >>>GCMRUN_CATCHCN<<>>GCMRUN_CATCHCN<<>>GCMRUN_CATCHCN<<>>GCMRUN_CATCHCN<< $FILE >>>GCMRUN_CATCHCN<<>>GCMRUN_CATCHCN<<>>GCMRUN_CATCHCN<<>>GCMRUN_CATCHCN<< Date: Thu, 9 Mar 2023 14:10:58 -0500 Subject: [PATCH 2/4] update bcs path --- gcm_CPLFCST360NM2_setup | 2 +- gcm_CPLFCST360S2S_setup | 2 +- gcm_CPLFCST360S2Sallsetup | 2 +- gcm_forecast.tmpl | 2 +- gcm_run.j | 2 +- gcm_setup | 2 +- geoschemchem_setup | 2 +- gmichem_setup | 2 +- stratchem_setup | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/gcm_CPLFCST360NM2_setup b/gcm_CPLFCST360NM2_setup index 19b8f4a5..19adfbf3 100755 --- a/gcm_CPLFCST360NM2_setup +++ b/gcm_CPLFCST360NM2_setup @@ -1159,7 +1159,7 @@ else if( $SITE == 'NCCS' ) then setenv ARCHIVE_P "SBATCH --ntasks=1" # PE Configuration for gcm_archive.j setenv CONVERT_P "SBATCH --ntasks=${CNV_NPES}" # PE Configuration for gcm_convert.j setenv MOVE_P "SBATCH --ntasks=1" # PE Configuration for gcm_moveplot.j - setenv BCSDIR /discover/nobackup/ltakacs/bcs/Ganymed-4_0/$BCSTAG # location of Boundary Conditions + setenv BCSDIR /discover/nobackup/projects/gmao/bcs_shared/legacy_bcs/Ganymed-4_0/$BCSTAG # location of Boundary Conditions if( ${OGCM_IM}x${OGCM_JM} == "1440x720" ) then setenv SSTDIR $SHARE/dao_ops/fvInput/g5gcm/bcs/SST/${OGCM_IM}x${OGCM_JM} # location of SST Boundary Conditions else diff --git a/gcm_CPLFCST360S2S_setup b/gcm_CPLFCST360S2S_setup index 4e1b7dbf..cce070fd 100755 --- a/gcm_CPLFCST360S2S_setup +++ b/gcm_CPLFCST360S2S_setup @@ -1155,7 +1155,7 @@ else if( $SITE == 'NCCS' ) then setenv ARCHIVE_P "SBATCH --ntasks=1" # PE Configuration for gcm_archive.j setenv CONVERT_P "SBATCH --ntasks=${CNV_NPES}" # PE Configuration for gcm_convert.j setenv MOVE_P "SBATCH --ntasks=1" # PE Configuration for gcm_moveplot.j - setenv BCSDIR /discover/nobackup/ltakacs/bcs/Ganymed-4_0/$BCSTAG # location of Boundary Conditions + setenv BCSDIR /discover/nobackup/projects/gmao/bcs_shared/legacy_bcs/Ganymed-4_0/$BCSTAG # location of Boundary Conditions if( ${OGCM_IM}x${OGCM_JM} == "1440x720" ) then setenv SSTDIR $SHARE/dao_ops/fvInput/g5gcm/bcs/SST/${OGCM_IM}x${OGCM_JM} # location of SST Boundary Conditions else diff --git a/gcm_CPLFCST360S2Sallsetup b/gcm_CPLFCST360S2Sallsetup index ef4f4241..0ab7fa6a 100755 --- a/gcm_CPLFCST360S2Sallsetup +++ b/gcm_CPLFCST360S2Sallsetup @@ -1161,7 +1161,7 @@ else if( $SITE == 'NCCS' ) then setenv PLOT_P "SBATCH --nodes=4 --ntasks=4" # PE Configuration for gcm_plot.j setenv ARCHIVE_P "SBATCH --ntasks=1" # PE Configuration for gcm_archive.j setenv CONVERT_P "SBATCH --ntasks=${CNV_NPES}" # PE Configuration for gcm_convert.j - setenv BCSDIR /discover/nobackup/ltakacs/bcs/Ganymed-4_0/$BCSTAG # location of Boundary Conditions + setenv BCSDIR /discover/nobackup/projects/gmao/bcs_shared/legacy_bcs/Ganymed-4_0/$BCSTAG # location of Boundary Conditions if( ${OGCM_IM}x${OGCM_JM} == "1440x720" ) then setenv SSTDIR $SHARE/dao_ops/fvInput/g5gcm/bcs/SST/${OGCM_IM}x${OGCM_JM} # location of SST Boundary Conditions else diff --git a/gcm_forecast.tmpl b/gcm_forecast.tmpl index 33dfbb7b..9009466f 100755 --- a/gcm_forecast.tmpl +++ b/gcm_forecast.tmpl @@ -424,7 +424,7 @@ cat << _EOF_ > $FILE >>>GCMRUN_CATCHCN<<>>GCMRUN_CATCHCN<<>>GCMRUN_CATCHCN<<>>GCMRUN_CATCHCN<<>>GCMRUN_CATCHCN<< $FILE >>>GCMRUN_CATCHCN<<>>GCMRUN_CATCHCN<<>>GCMRUN_CATCHCN<<>>GCMRUN_CATCHCN<<>>GCMRUN_CATCHCN<< Date: Mon, 20 Mar 2023 11:27:19 -0400 Subject: [PATCH 3/4] cleanup of scaling leftover --- gcm_forecast.tmpl | 8 -------- gcm_run.j | 8 -------- gcm_run_benchmark.j | 9 --------- 3 files changed, 25 deletions(-) diff --git a/gcm_forecast.tmpl b/gcm_forecast.tmpl index f988d915..5d1b796c 100755 --- a/gcm_forecast.tmpl +++ b/gcm_forecast.tmpl @@ -419,14 +419,6 @@ cat << _EOF_ > $FILE @COUPLED/bin/ln -sf $ABCSDIR/ndvi_clim_@RES_DATELINE.data ndvi.data >>>GCMRUN_CATCHCN<<>>GCMRUN_CATCHCN<<>>GCMRUN_CATCHCN<<>>GCMRUN_CATCHCN<<>>GCMRUN_CATCHCN<<>>GCMRUN_CATCHCN<<>>GCMRUN_CATCHCN<<>>GCMRUN_CATCHCN<<>>GCMRUN_CATCHCN<<>>GCMRUN_CATCHCN<< $FILE @COUPLED/bin/ln -sf $ABCSDIR/ndvi_clim_@RES_DATELINE.data ndvi.data >>>GCMRUN_CATCHCN<<>>GCMRUN_CATCHCN<<>>GCMRUN_CATCHCN<<>>GCMRUN_CATCHCN<<>>GCMRUN_CATCHCN<<>>GCMRUN_CATCHCN<<>>GCMRUN_CATCHCN<<>>GCMRUN_CATCHCN<<>>GCMRUN_CATCHCN<<>>GCMRUN_CATCHCN<< $FILE @COUPLED/bin/ln -sf $ABCSDIR/ndvi_clim_@RES_DATELINE.data ndvi.data >>>GCMRUN_CATCHCN<<>>GCMRUN_CATCHCN<<>>GCMRUN_CATCHCN<<>>GCMRUN_CATCHCN<<>>GCMRUN_CATCHCN<<>>GCMRUN_CATCHCN<<>>GCMRUN_CATCHCN<<>>GCMRUN_CATCHCN<<>>GCMRUN_CATCHCN<<>>GCMRUN_CATCHCN<<>>GCMRUN_CATCHCN<< Date: Mon, 20 Mar 2023 11:52:01 -0400 Subject: [PATCH 4/4] updated path --- gcm_run_benchmark.j | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gcm_run_benchmark.j b/gcm_run_benchmark.j index 568a2255..3d870e7e 100755 --- a/gcm_run_benchmark.j +++ b/gcm_run_benchmark.j @@ -377,7 +377,7 @@ cat << _EOF_ > $FILE @COUPLED/bin/ln -sf $ABCSDIR/ndvi_clim_@RES_DATELINE.data ndvi.data >>>GCMRUN_CATCHCN<<>>GCMRUN_CATCHCN<<>>GCMRUN_CATCHCN<<