Skip to content

Commit 980190a

Browse files
committed
mid-test push to my fork for additional testing on laramie
1 parent 3f78650 commit 980190a

4 files changed

Lines changed: 8 additions & 8 deletions

File tree

Machines/cheyenne_modules

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
echo "Python boot-strap modules for machine cheyenne"
44

55
module load python/2.7.16
6-
module load intel/17.0.1
6+
##module load intel/17.0.1
7+
module load gnu/8.3.0
78
module load ncarenv
89
module load ncarcompilers
910
module load mpt/2.19

Machines/machine_postprocess.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,16 +132,16 @@
132132
<pythonpath></pythonpath>
133133
<f2py fcompiler="intelem" f77exec="/glade/u/apps/ch/opt/ncarcompilers/0.4.1/mpi/ifort">f2py</f2py>
134134
<za>
135-
<compiler>ifort</compiler>
135+
<compiler>gfortran</compiler>
136136
<flags>-c -g -O2</flags>
137-
<include>-I/glade/u/apps/ch/opt/netcdf/4.6.1/intel/17.0.1/include</include>
138-
<libs>-L/glade/u/apps/ch/opt/netcdf/4.6.1/intel/17.0.1/lib -lnetcdff -lnetcdf</libs>
137+
<include>-I/glade/u/apps/ch/opt/netcdf/4.6.3/gnu/8.3.0/include</include>
138+
<libs>-L/glade/u/apps/ch/opt/netcdf/4.6.3/gnu/8.3.0/lib -lnetcdff -lnetcdf</libs>
139139
</za>
140140
<reset_modules>
141141
<module>module purge</module>
142142
</reset_modules>
143143
<modules>
144-
<module>module load intel/17.0.1</module>
144+
<module>module load gnu/8.3.0</module>
145145
<module>module load ncarenv</module>
146146
<module>module load ncarcompilers</module>
147147
<module>module load mpt/2.19</module>

Tools/ration_script

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ pwd
2323
. activate
2424

2525
## load the boot-strap modules
26-
##module load python/2.7.14
27-
module load intel/17.0.1
26+
module load gnu/8.3.0
2827
module load ncarenv
2928
module load ncarcompilers
3029
module load mpt/2.19

timeseries/timeseries/cesm_tseries_generator.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ def commandline_options():
7070
err_msg = 'cesm_tseries_generator.py ERROR: invalid option --caseroot {0}'.format(options.caseroot[0])
7171
raise OSError(err_msg)
7272

73-
return options.caseroot[0], options.debug, options.standalone, options.backtrace
73+
return options.caseroot[0], options.debug[0], options.standalone, options.backtrace
7474

7575
#==============================================================================================
7676
# readArchiveXML - read the $CASEROOT/env_timeseries.xml file and build the pyReshaper classes

0 commit comments

Comments
 (0)