Merge pull request #186 from GEOS-ESM/bugfixes/jstassi/#185/fvsetup

Bugfixes/jstassi/#185/fvsetup
GEOS-ESM · Jul 25, 2022 · 5cf2e88 · 5cf2e88
2 parents b648de9 + 12e765a
commit 5cf2e88
Show file tree

Hide file tree

Showing 15 changed files with 32 additions and 31 deletions.
diff --git a/src/Applications/GEOSdas_App/fvsetup b/src/Applications/GEOSdas_App/fvsetup
@@ -8331,9 +8331,9 @@ print  SCRIPT <<"EOF";
 
           cd \$FVWORK
           if (`uname -n` =~ borg*) then
-             cat \$PBS_NODEFILE | head -1 > \$FVWORK/OIQC_list
-             cat \$PBS_NODEFILE | tail +2 > \$FVWORK/GCM_list
-             cat \$PBS_NODEFILE           > \$FVWORK/ANA_list
+             cat \$PBS_NODEFILE | head -1    > \$FVWORK/OIQC_list
+             cat \$PBS_NODEFILE | tail -n +2 > \$FVWORK/GCM_list
+             cat \$PBS_NODEFILE              > \$FVWORK/ANA_list
              subset_nodefile.pl \$NCPUS_IDF -f \$PBS_NODEFILE -o \$FVWORK/IDF_list
              subset_nodefile.pl \$NCPUS_IAU -f \$PBS_NODEFILE -o \$FVWORK/IAU_list
           endif
@@ -8610,6 +8610,7 @@ EOF
            endif
            echo2 ""
            echo2 "setenv FVHOME \$FVHOME"
+           echo2 "setenv ARCHIVE \$FVARCH"
            echo2 "set Bin = \$Bin"
            echo2 "set output = \$lname2"
            echo2 ""

diff --git a/src/Applications/GEOSdas_App/testsuites/C180RPY.input b/src/Applications/GEOSdas_App/testsuites/C180RPY.input
@@ -2,9 +2,9 @@
 # C180RPY.input
 #------------
 
-codeID: b3a880f
+codeID: 523f29e
 description: C180RPY__GEOSadas-5_29_3__agrid_C180__ogrid_C
-fvsetupID: f7d8d041c9
+fvsetupID: f7aaa973c7
 
 ---ENDHEADERS---
 

diff --git a/src/Applications/GEOSdas_App/testsuites/C180T14RPY.input b/src/Applications/GEOSdas_App/testsuites/C180T14RPY.input
@@ -2,9 +2,9 @@
 # C180T14RPY.input
 #------------
 
-codeID: b3a880f
+codeID: 523f29e
 description: C180T14RPY__GEOSadas-5_29_3__agrid_C180__ogrid_T14
-fvsetupID: f7d8d041c9
+fvsetupID: f7aaa973c7
 
 ---ENDHEADERS---
 

diff --git a/src/Applications/GEOSdas_App/testsuites/C360L181_replay.input b/src/Applications/GEOSdas_App/testsuites/C360L181_replay.input
@@ -2,9 +2,9 @@
 # C360L181_replay.input
 #------------
 
-codeID: b3a880f
+codeID: 523f29e
 description: C360L181_replay__GEOSadas-5_29_3__agrid_C360__ogrid_C
-fvsetupID: f7d8d041c9
+fvsetupID: f7aaa973c7
 
 ---ENDHEADERS---
 

diff --git a/src/Applications/GEOSdas_App/testsuites/C360L91_replay.input b/src/Applications/GEOSdas_App/testsuites/C360L91_replay.input
@@ -2,9 +2,9 @@
 # C360L91_replay.input
 #------------
 
-codeID: b3a880f
+codeID: 523f29e
 description: C360L91_replay__GEOSadas-5_29_3__agrid_C360__ogrid_C
-fvsetupID: f7d8d041c9
+fvsetupID: f7aaa973c7
 
 ---ENDHEADERS---
 

diff --git a/src/Applications/GEOSdas_App/testsuites/C48f.input b/src/Applications/GEOSdas_App/testsuites/C48f.input
@@ -2,9 +2,9 @@
 # C48f.input
 #-----------
 
-codeID: b3a880f
+codeID: 523f29e
 description: C48f__GEOSadas-5_29_3__agrid_C48__ogrid_f34
-fvsetupID: f7d8d041c9
+fvsetupID: f7aaa973c7
 fvsetupflags: -sensdeg 1
 
 ---ENDHEADERS---

diff --git a/src/Applications/GEOSdas_App/testsuites/C90C.input b/src/Applications/GEOSdas_App/testsuites/C90C.input
@@ -2,9 +2,9 @@
 # C90C.input
 #-----------
 
-codeID: b3a880f
+codeID: 523f29e
 description: C90C__GEOSadas-5_29_3__agrid_C90__ogrid_CS
-fvsetupID: f7d8d041c9
+fvsetupID: f7aaa973c7
 
 ---ENDHEADERS---
 

diff --git a/src/Applications/GEOSdas_App/testsuites/C90C_ens.input b/src/Applications/GEOSdas_App/testsuites/C90C_ens.input
@@ -2,9 +2,9 @@
 # C90C_ens.input
 #---------------
 
-codeID: b3a880f
+codeID: 523f29e
 description: C90C_ens__GEOSadas-5_29_3__agrid_C90__ogrid_C
-fvsetupID: f7d8d041c9
+fvsetupID: f7aaa973c7
 
 ---ENDHEADERS---
 

diff --git a/src/Applications/GEOSdas_App/testsuites/C90C_replay.input b/src/Applications/GEOSdas_App/testsuites/C90C_replay.input
@@ -2,9 +2,9 @@
 # C90C_replay.input
 #---------------
 
-codeID: b3a880f
+codeID: 523f29e
 description: C90C_replay__86f27c6__agrid_C90__ogrid_C
-fvsetupID: f7d8d041c9
+fvsetupID: f7aaa973c7
 
 ---ENDHEADERS---
 

diff --git a/src/Applications/GEOSdas_App/testsuites/fpp.input b/src/Applications/GEOSdas_App/testsuites/fpp.input
@@ -2,9 +2,9 @@
 # fpp.input
 #------------
 
-codeID: b3a880f
+codeID: 523f29e
 description: fpp__GEOSadas-5_29_3__agrid_C720__ogrid_C
-fvsetupID: f7d8d041c9
+fvsetupID: f7aaa973c7
 
 ---ENDHEADERS---
 

diff --git a/src/Applications/GEOSdas_App/testsuites/geos_it.input b/src/Applications/GEOSdas_App/testsuites/geos_it.input
@@ -2,9 +2,9 @@
 # geos_it.input
 #--------------
 
-codeID: 7f742b1
+codeID: 523f29e
 description: geos_it__agrid_C180__ogrid_C
-fvsetupID: bbf4f10063
+fvsetupID: f7aaa973c7
 
 ---ENDHEADERS---
 

diff --git a/src/Applications/GEOSdas_App/testsuites/prePP.input b/src/Applications/GEOSdas_App/testsuites/prePP.input
@@ -2,9 +2,9 @@
 # prePP.input
 #------------
 
-codeID: b3a880f
+codeID: 523f29e
 description: prePP__GEOSadas-5_29_3__agrid_C720__ogrid_C
-fvsetupID: f7d8d041c9
+fvsetupID: f7aaa973c7
 
 ---ENDHEADERS---
 

diff --git a/src/Applications/GEOSdas_App/testsuites/x0046a.input b/src/Applications/GEOSdas_App/testsuites/x0046a.input
@@ -2,9 +2,9 @@
 # x0046a.input
 #------------
 
-codeID: b3a880f
+codeID: 523f29e
 description: x0046a__GEOSadas-5_29_3__agrid_C360__ogrid_C
-fvsetupID: f7d8d041c9
+fvsetupID: f7aaa973c7
 
 ---ENDHEADERS---
 

diff --git a/src/Applications/GEOSdas_App/testsuites/x0046aRPY.input b/src/Applications/GEOSdas_App/testsuites/x0046aRPY.input
@@ -2,9 +2,9 @@
 # x0046aRPY.input
 #------------
 
-codeID: b3a880f
+codeID: 523f29e
 description: x0046aRPY__GEOSadas-5_29_3__agrid_C360__ogrid_C
-fvsetupID: f7d8d041c9
+fvsetupID: f7aaa973c7
 
 ---ENDHEADERS---
 

diff --git a/src/Applications/GEOSdas_App/testsuites/x0046a_Summer.input b/src/Applications/GEOSdas_App/testsuites/x0046a_Summer.input
@@ -2,9 +2,9 @@
 # x0046a.input
 #------------
 
-codeID: b3a880f
+codeID: 523f29e
 description: x0046a__GEOSadas-5_29_3__agrid_C360__ogrid_C
-fvsetupID: f7d8d041c9
+fvsetupID: f7aaa973c7
 
 ---ENDHEADERS---