[Dart-dev] DART/branches Revision: 13027

[dart at ucar.edu]

nancy at ucar.edu
2019-03-19 17:01:54 -0600 (Tue, 19 Mar 2019)
89
copy and restore original input.nml and obs_seq.* files
before and after running tests.




Modified: DART/branches/recam/models/buildall.csh
===================================================================
--- DART/branches/recam/models/buildall.csh	2019-03-19 20:56:41 UTC (rev 13026)
+++ DART/branches/recam/models/buildall.csh	2019-03-19 23:01:54 UTC (rev 13027)
@@ -53,6 +53,9 @@
 if ( ! $?COPY) then
    setenv COPY 'cp -f'
 endif
+if ( ! $?MOVE) then
+   setenv MOVE 'mv -f'
+endif
 
 if ( ! $?host) then
    setenv host `uname -n`
@@ -158,10 +161,12 @@
       echo skipping tests of the template directory
 
     else 
+      # save original input.nml & obs seq files here
+      set SAVEDIR = saveme.test_dart
+      mkdir -p ${SAVEDIR}
+      ${COPY} input.nml obs_seq.* ${SAVEDIR}
+
       if ( -f workshop_setup.csh ) then
-        set SAVEDIR = saveme.test_dart
-        mkdir -p ${SAVEDIR}
-        ${COPY} input.nml obs_seq.* ${SAVEDIR}
   
         echo "Trying to run workshop_setup.csh for model $MODEL as a test"
         ./workshop_setup.csh || set FAILURE = 1
@@ -168,10 +173,6 @@
         echo "Re-running workshop_setup.csh to test overwriting files for model $MODEL"
         ./workshop_setup.csh || set FAILURE = 1
   
-        echo "Restoring original input.nml and obs_seq files"
-        ${COPY} ${SAVEDIR}/* .
-        ${REMOVE} ${SAVEDIR}
-  
       else
         echo "Trying to run pmo for model $MODEL as a test"
         echo "Will generate NetCDF files from any .cdl files first."
@@ -203,6 +204,11 @@
       set PROG = `echo $TARGET | sed -e 's#mkmf_##'`
       ${REMOVE} $PROG
     end
+
+    echo "Restoring original input.nml and obs_seq files"
+    ${MOVE} ${SAVEDIR}/* .
+    ${REMOVE} ${SAVEDIR}
+  
     if ( $ncdlfiles > 0 ) then
       foreach i ( *.cdl )
         set base = `basename $i .cdl`