machine specific fixes for edison/cori/slurm systems

E3SM-Project · Jul 28, 2016 · 3703d94 · 3703d94
1 parent f6dc40a
commit 3703d94
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/cime_config/cesm/machines/config_batch.xml b/cime_config/cesm/machines/config_batch.xml
@@ -131,7 +131,6 @@
        <arg flag="--time" name="$JOB_WALLCLOCK_TIME"/>
        <arg flag="-p" name="$JOB_QUEUE"/>
        <arg flag="--account" name="$PROJECT"/>
-       <arg flag="-n" name="$TOTALPES"/>
      </submit_args>
      <directives>
        <directive> --job-name={{ job_id }}</directive>

diff --git a/driver_cpl/driver/prep_ocn_mod.F90 b/driver_cpl/driver/prep_ocn_mod.F90
@@ -1191,8 +1191,8 @@ subroutine prep_ocn_calc_r2x_ox(timer)
 
        call seq_map_map(mapper_Rr2o, r2x_rx, r2x_ox(eri), &
             fldlist='Forr_rofl:Forr_rofi:                       &
-                     Forr_rofl_16O:Forr_rofi_16O:Forr_rofl_18O: &
-                     Forr_rofi_18O:Forr_rofl_HDO:Forr_rofi_HDO', norm=.false.)
+                    & Forr_rofl_16O:Forr_rofi_16O:Forr_rofl_18O: &
+                    & Forr_rofi_18O:Forr_rofl_HDO:Forr_rofi_HDO', norm=.false.)
        if (flood_present) then
           call seq_map_map(mapper_Fr2o, r2x_rx, r2x_ox(eri), &
                fldlist='Flrr_flood', norm=.true.)

diff --git a/driver_cpl/driver/prep_wav_mod.F90 b/driver_cpl/driver/prep_wav_mod.F90
@@ -97,6 +97,7 @@ subroutine prep_wav_init(infodata, atm_c2_wav, ocn_c2_wav, ice_c2_wav)
          wav_present=wav_present      , &
          ocn_gnam=ocn_gnam            , &
          wav_gnam=wav_gnam            , &
+         atm_gnam=atm_gnam            , &
          esmf_map_flag=esmf_map_flag  )
 
     allocate(mapper_sa2w)