[Dart-dev] DART/branches Revision: 11919

dart at ucar.edu dart at ucar.edu
Tue Aug 29 14:37:00 MDT 2017


hendric at ucar.edu
2017-08-29 14:36:59 -0600 (Tue, 29 Aug 2017)
28
syncing with the rma_trunk




Index: DART/branches/rma_fix_clm_restarts
===================================================================
--- DART/branches/rma_fix_clm_restarts	2017-08-29 20:22:19 UTC (rev 11918)
+++ DART/branches/rma_fix_clm_restarts	2017-08-29 20:36:59 UTC (rev 11919)

Property changes on: DART/branches/rma_fix_clm_restarts
___________________________________________________________________
Modified: svn:mergeinfo
## -33,7 +33,7 ##
 /DART/branches/rma_sprint:8095-8166
 /DART/branches/rma_state_structure_test_dir:9472-9676
 /DART/branches/rma_state_structure_unit_test:9691-10268
-/DART/branches/rma_trunk:9634-11891
+/DART/branches/rma_trunk:9634-11918
 /DART/branches/rma_trunk_clamping:8786-8801
 /DART/branches/rma_trunk_filename:8011-8157
 /DART/branches/rma_trunk_get_state_fun:8568-8596
Modified: DART/branches/rma_fix_clm_restarts/developer_tests/location/channel/test/path_names_location_test
===================================================================
--- DART/branches/rma_fix_clm_restarts/developer_tests/location/channel/test/path_names_location_test	2017-08-29 20:22:19 UTC (rev 11918)
+++ DART/branches/rma_fix_clm_restarts/developer_tests/location/channel/test/path_names_location_test	2017-08-29 20:36:59 UTC (rev 11919)
@@ -1,4 +1,5 @@
 assimilation_code/location/channel/location_mod.f90
+assimilation_code/location/utilities/default_location_mod.f90
 assimilation_code/modules/observations/obs_kind_mod.f90
 assimilation_code/modules/utilities/ensemble_manager_mod.f90
 assimilation_code/modules/utilities/null_mpi_utilities_mod.f90

Modified: DART/branches/rma_fix_clm_restarts/developer_tests/location/channel/test/path_names_location_test3
===================================================================
--- DART/branches/rma_fix_clm_restarts/developer_tests/location/channel/test/path_names_location_test3	2017-08-29 20:22:19 UTC (rev 11918)
+++ DART/branches/rma_fix_clm_restarts/developer_tests/location/channel/test/path_names_location_test3	2017-08-29 20:36:59 UTC (rev 11919)
@@ -1,4 +1,5 @@
 assimilation_code/location/channel/location_mod.f90
+assimilation_code/location/utilities/default_location_mod.f90
 assimilation_code/modules/observations/obs_kind_mod.f90
 assimilation_code/modules/utilities/null_mpi_utilities_mod.f90
 assimilation_code/modules/utilities/random_seq_mod.f90

Modified: DART/branches/rma_fix_clm_restarts/developer_tests/obs_sequence/work/input.nml
===================================================================
--- DART/branches/rma_fix_clm_restarts/developer_tests/obs_sequence/work/input.nml	2017-08-29 20:22:19 UTC (rev 11918)
+++ DART/branches/rma_fix_clm_restarts/developer_tests/obs_sequence/work/input.nml	2017-08-29 20:36:59 UTC (rev 11919)
@@ -4,7 +4,7 @@
    output_obs_def_mod_file = '../../../observations/forward_operators/obs_def_mod.f90',
    input_obs_kind_mod_file = '../../../assimilation_code/modules/observations/DEFAULT_obs_kind_mod.F90',
   output_obs_kind_mod_file = '../../../assimilation_code/modules/observations/obs_kind_mod.f90',
-  input_files = '../../../observations/forward_operators/obs_def_1d_state_mod.f90',
+               input_files = '../../../observations/forward_operators/obs_def_1d_state_mod.f90',
 /
 
 &assim_model_nml

Index: DART/branches/rma_fix_clm_restarts/observations/obs_converters/NCEP
===================================================================
--- DART/branches/rma_fix_clm_restarts/observations/obs_converters/NCEP	2017-08-29 20:22:19 UTC (rev 11918)
+++ DART/branches/rma_fix_clm_restarts/observations/obs_converters/NCEP	2017-08-29 20:36:59 UTC (rev 11919)

Property changes on: DART/branches/rma_fix_clm_restarts/observations/obs_converters/NCEP
___________________________________________________________________
Modified: svn:mergeinfo
## -63,7 +63,7 ##
 /DART/branches/rma_state_structure_test_dir/observations/obs_converters/NCEP:9472-9676
 /DART/branches/rma_state_structure_unit_test/observations/NCEP:9691-10268
 /DART/branches/rma_state_structure_unit_test/observations/obs_converters/NCEP:9691-10268
-/DART/branches/rma_trunk/observations/obs_converters/NCEP:9634-9728,11289-11882
+/DART/branches/rma_trunk/observations/obs_converters/NCEP:9634-9728,11289-11918
 /DART/branches/rma_trunk_clamping/observations/NCEP:8786-8801
 /DART/branches/rma_trunk_clamping/observations/obs_converters/NCEP:8786-8801
 /DART/branches/rma_trunk_filename/observations/NCEP:8011-8157
Modified: DART/branches/rma_fix_clm_restarts/observations/obs_converters/NCEP/prep_bufr/install.sh
===================================================================
--- DART/branches/rma_fix_clm_restarts/observations/obs_converters/NCEP/prep_bufr/install.sh	2017-08-29 20:22:19 UTC (rev 11918)
+++ DART/branches/rma_fix_clm_restarts/observations/obs_converters/NCEP/prep_bufr/install.sh	2017-08-29 20:36:59 UTC (rev 11919)
@@ -28,24 +28,32 @@
  
 #  ------------------------------------------------------------------------
 #  CCOMP, FCOMP - select the compiler combination to use
+#    either set in the environment before calling, or set here.
 #  ------------------------------------------------------------------------
  
-CCOMP=gnu
-#CCOMP=intel
-#CCOMP=pgi
-#CCOMP=default
+if [ "$CCOMP" == "" ]; then
+ CCOMP=gnu
+ #CCOMP=intel
+ #CCOMP=pgi
+ #CCOMP=default
+fi
 
-FCOMP=gnu
-#FCOMP=intel
-#FCOMP=pgi
-#FCOMP=f77
+if [ "$FCOMP" == "" ]; then
+ FCOMP=gnu
+ #FCOMP=intel
+ #FCOMP=pgi
+ #FCOMP=f77


More information about the Dart-dev mailing list