[Dart-dev] [6523] DART/trunk/models/cam/shell_scripts: Removing mention of the ' development' branch of DART - these
nancy at ucar.edu
nancy at ucar.edu
Thu Oct 17 10:20:30 MDT 2013
Revision: 6523
Author: thoar
Date: 2013-10-17 10:20:29 -0600 (Thu, 17 Oct 2013)
Log Message:
-----------
Removing mention of the 'development' branch of DART - these
should use the 'trunk' (since 'development' is "gone")
Moved the bit about modifying the input.nml number of instances
from the assimilate scripts to the setup scripts. This is consistent
with the way forward and so if anyone wanted to revive these,
they would be more likely to work.
Modified Paths:
--------------
DART/trunk/models/cam/shell_scripts/CESM_setup_startup_hopper.csh
DART/trunk/models/cam/shell_scripts/CESM_setup_zagar.csh
DART/trunk/models/cam/shell_scripts/CESM_setup_zagar_pmo.csh
DART/trunk/models/cam/shell_scripts/assimilate.Fzagar.csh
DART/trunk/models/cam/shell_scripts/assimilate.hopper.csh
DART/trunk/models/cam/shell_scripts/assimilate.ned.csh
DART/trunk/models/cam/shell_scripts/assimilate.zagar.csh
DART/trunk/models/cam/shell_scripts/setup_cesm_case.ned.csh
DART/trunk/models/cam/shell_scripts/setup_cesm_case.pmo.csh
-------------- next part --------------
Modified: DART/trunk/models/cam/shell_scripts/CESM_setup_startup_hopper.csh
===================================================================
--- DART/trunk/models/cam/shell_scripts/CESM_setup_startup_hopper.csh 2013-10-16 23:10:19 UTC (rev 6522)
+++ DART/trunk/models/cam/shell_scripts/CESM_setup_startup_hopper.csh 2013-10-17 16:20:29 UTC (rev 6523)
@@ -387,6 +387,16 @@
${COPY} ${DARTroot}/models/cam/shell_scripts/assimilate.csh .
${COPY} ${DARTroot}/models/cam/work/input.nml .
+# Ensure that the input.nml ensemble size matches the number of instances.
+# WARNING: the output files contain ALL ensemble members ==> BIG
+
+ex input.nml <<ex_end
+g;ens_size ;s;= .*;= $num_instances;
+g;num_output_state_members ;s;= .*;= $num_instances;
+g;num_output_obs_members ;s;= .*;= $num_instances;
+wq
+ex_end
+
# ====================================================================
# Update the scripts that build the namelists.
# The active components scripts need to support the multi-instance naming.
Modified: DART/trunk/models/cam/shell_scripts/CESM_setup_zagar.csh
===================================================================
--- DART/trunk/models/cam/shell_scripts/CESM_setup_zagar.csh 2013-10-16 23:10:19 UTC (rev 6522)
+++ DART/trunk/models/cam/shell_scripts/CESM_setup_zagar.csh 2013-10-17 16:20:29 UTC (rev 6523)
@@ -63,7 +63,7 @@
# ================================
setenv mach bluefire ;# machine
-setenv DARTdir /glade/home/thoar/svn/DART/dev ;# DART executables, scripts and input
+setenv DARTdir /glade/home/thoar/svn/DART/trunk ;# DART executables, scripts and input
setenv cesm_datadir /glade/proj3/cseg/inputdata
setenv cesm_public /glade/proj3/cseg ;# location of public CESM sandbox
Modified: DART/trunk/models/cam/shell_scripts/CESM_setup_zagar_pmo.csh
===================================================================
--- DART/trunk/models/cam/shell_scripts/CESM_setup_zagar_pmo.csh 2013-10-16 23:10:19 UTC (rev 6522)
+++ DART/trunk/models/cam/shell_scripts/CESM_setup_zagar_pmo.csh 2013-10-17 16:20:29 UTC (rev 6523)
@@ -63,7 +63,7 @@
# ================================
setenv mach bluefire ;# machine
-setenv DARTdir /glade/home/thoar/svn/DART/dev ;# DART executables, scripts and input
+setenv DARTdir /glade/home/thoar/svn/DART/trunk ;# DART executables, scripts and input
setenv cesm_public /glade/proj3/cseg ;# location of public CESM sandbox
setenv cesm_datadir /glade/proj3/cseg/inputdata
Modified: DART/trunk/models/cam/shell_scripts/assimilate.Fzagar.csh
===================================================================
--- DART/trunk/models/cam/shell_scripts/assimilate.Fzagar.csh 2013-10-16 23:10:19 UTC (rev 6522)
+++ DART/trunk/models/cam/shell_scripts/assimilate.Fzagar.csh 2013-10-17 16:20:29 UTC (rev 6523)
@@ -69,17 +69,6 @@
${COPY} /glade/proj3/DART/raeder/FV1deg_4.0/cam_phis.nc .
-# Modify the DART input.nml such that
-# the DART ensemble size matches the CESM number of instances
-# WARNING: the output files contain ALL enemble members ==> BIG
-
-ex input.nml <<ex_end
-g;ens_size ;s;= .*;= $ensemble_size;
-g;num_output_state_members ;s;= .*;= $ensemble_size;
-g;num_output_obs_members ;s;= .*;= $ensemble_size;
-wq
-ex_end
-
#-------------------------------------------------------------------------
# DART SAMPLING ERROR CORRECTION BLOCK
# This stages the files needed for the sampling error correction.
Modified: DART/trunk/models/cam/shell_scripts/assimilate.hopper.csh
===================================================================
--- DART/trunk/models/cam/shell_scripts/assimilate.hopper.csh 2013-10-16 23:10:19 UTC (rev 6522)
+++ DART/trunk/models/cam/shell_scripts/assimilate.hopper.csh 2013-10-17 16:20:29 UTC (rev 6523)
@@ -75,17 +75,6 @@
#${COPY} /glade/proj3/DART/raeder/FV1deg_4.0/cam_phis.nc .
${COPY} $HOME/cam_phis.nc .
-# Modify the DART input.nml such that
-# the DART ensemble size matches the CESM number of instances
-# WARNING: the output files contain ALL enemble members ==> BIG
-
-ex input.nml <<ex_end
-g;ens_size ;s;= .*;= $ensemble_size;
-g;num_output_state_members ;s;= .*;= $ensemble_size;
-g;num_output_obs_members ;s;= .*;= $ensemble_size;
-wq
-ex_end
-
#-------------------------------------------------------------------------
# DART SAMPLING ERROR CORRECTION BLOCK
# This stages the files needed for the sampling error correction.
Modified: DART/trunk/models/cam/shell_scripts/assimilate.ned.csh
===================================================================
--- DART/trunk/models/cam/shell_scripts/assimilate.ned.csh 2013-10-16 23:10:19 UTC (rev 6522)
+++ DART/trunk/models/cam/shell_scripts/assimilate.ned.csh 2013-10-17 16:20:29 UTC (rev 6523)
@@ -83,17 +83,6 @@
#${COPY} /glade/proj3/DART/raeder/FV1deg_4.0/cam_phis.nc .
${COPY} $HOME/cam_phis.nc .
-# Modify the DART input.nml such that
-# the DART ensemble size matches the CESM number of instances
-# WARNING: the output files contain ALL enemble members ==> BIG
-
-ex input.nml <<ex_end
-g;ens_size ;s;= .*;= $ensemble_size;
-g;num_output_state_members ;s;= .*;= $ensemble_size;
-g;num_output_obs_members ;s;= .*;= $ensemble_size;
-wq
-ex_end
-
#-------------------------------------------------------------------------
# DART SAMPLING ERROR CORRECTION BLOCK
# This stages the files needed for the sampling error correction.
Modified: DART/trunk/models/cam/shell_scripts/assimilate.zagar.csh
===================================================================
--- DART/trunk/models/cam/shell_scripts/assimilate.zagar.csh 2013-10-16 23:10:19 UTC (rev 6522)
+++ DART/trunk/models/cam/shell_scripts/assimilate.zagar.csh 2013-10-17 16:20:29 UTC (rev 6523)
@@ -66,17 +66,6 @@
${COPY} /glade/proj3/DART/raeder/FV1deg_4.0/cam_phis.nc .
-# Modify the DART input.nml such that
-# the DART ensemble size matches the CESM number of instances
-# WARNING: the output files contain ALL enemble members ==> BIG
-
-ex input.nml <<ex_end
-g;ens_size ;s;= .*;= $ensemble_size;
-g;num_output_state_members ;s;= .*;= $ensemble_size;
-g;num_output_obs_members ;s;= .*;= $ensemble_size;
-wq
-ex_end
-
#-------------------------------------------------------------------------
# DART SAMPLING ERROR CORRECTION BLOCK
# This stages the files needed for the sampling error correction.
Modified: DART/trunk/models/cam/shell_scripts/setup_cesm_case.ned.csh
===================================================================
--- DART/trunk/models/cam/shell_scripts/setup_cesm_case.ned.csh 2013-10-16 23:10:19 UTC (rev 6522)
+++ DART/trunk/models/cam/shell_scripts/setup_cesm_case.ned.csh 2013-10-17 16:20:29 UTC (rev 6523)
@@ -68,7 +68,7 @@
setenv nancy_scratch $SCRATCH
setenv mach hopp2 ;# machine - must match cesm names
-setenv DARTdir ${nancy_home}/devel
+setenv DARTdir ${nancy_home}/trunk
setenv cesm_datadir /project/projectdirs/ccsm1/inputdata
Modified: DART/trunk/models/cam/shell_scripts/setup_cesm_case.pmo.csh
===================================================================
--- DART/trunk/models/cam/shell_scripts/setup_cesm_case.pmo.csh 2013-10-16 23:10:19 UTC (rev 6522)
+++ DART/trunk/models/cam/shell_scripts/setup_cesm_case.pmo.csh 2013-10-17 16:20:29 UTC (rev 6523)
@@ -69,7 +69,7 @@
setenv nancy_scratch $SCRATCH
setenv mach hopp2 ;# machine - must match cesm names
-setenv DARTdir ${nancy_home}/devel
+setenv DARTdir ${nancy_home}/trunk
setenv cesm_datadir /project/projectdirs/ccsm1/inputdata
More information about the Dart-dev
mailing list