[Dart-dev] DART/branches Revision: 12275

[dart at ucar.edu]

nancy at ucar.edu
2018-01-04 09:39:30 -0700 (Thu, 04 Jan 2018)
155
don't use 'svn revert' to restore the namelist file
after running workshop_setup.  make a save dir, copy
the files there, copy them back, remove the dir.




Modified: DART/branches/recam/models/buildall.csh
===================================================================
--- DART/branches/recam/models/buildall.csh	2018-01-04 16:36:59 UTC (rev 12274)
+++ DART/branches/recam/models/buildall.csh	2018-01-04 16:39:30 UTC (rev 12275)
@@ -50,6 +50,9 @@
 if ( ! $?REMOVE) then
    setenv REMOVE 'rm -f'
 endif
+if ( ! $?COPY) then
+   setenv COPY 'cp -f'
+endif
 
 if ( ! $?host) then
    setenv host `uname -n`
@@ -86,8 +89,6 @@
   wrf \
 )
 
-# needed soon: null_model
-
 #----------------------------------------------------------------------
 # Compile all executables for each model.
 #----------------------------------------------------------------------
@@ -137,11 +138,6 @@
 
 foreach MODEL ( $DO_THESE_MODELS ) 
     
-    if ($MODEL == 'bgrid_solo') then
-      echo 'skipping bgrid run for now'
-      continue
-    endif
-
     echo
     echo
     echo "=================================================================="
@@ -158,10 +154,18 @@
     @ ncdlfiles = `ls *.cdl | wc -l`
 
     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
       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."
@@ -177,9 +181,10 @@
       ./perfect_model_obs || set FAILURE = 1
       echo "Rerunning PMO to test for file overwrite"
       ./perfect_model_obs || set FAILURE = 1
+      # if possible, try running filter here as well?
     endif
 
-    echo "Removing the newly-built objects and restoring original input.nml"
+    echo "Removing the newly-built objects"
     ${REMOVE} *.o *.mod 
     ${REMOVE} Makefile input.nml.*_default .cppdefs
     foreach TARGET ( mkmf_* )
@@ -192,7 +197,6 @@
         if ( -f ${base}.nc ) rm ${base}.nc
       end
     endif
-    svn revert input.nml obs_seq.*
 
     @ modelnum = $modelnum + 1