Changeset 418 for palm/trunk/SCRIPTS/NCL/timeseries.ncl

Timestamp:

Dec 22, 2009 12:46:23 PM (15 years ago)

Author:

heinze

Message:

ncl_preferences is renamed .ncl.config.default

File:

• palm/trunk/SCRIPTS/NCL/timeseries.ncl (modified) (4 diffs)

palm/trunk/SCRIPTS/NCL/timeseries.ncl

@@ -5 +5 @@
  
 ;***************************************************
-; load ncl_preferences.ncl
+; load .ncl.config or .ncl.config.default
 ;***************************************************
 
@@ -14 +14 @@
    return(script)
 end
-   
-if (isfilepresent("~/ncl_preferences.ncl")) then
-   loadscript("~/ncl_preferences.ncl")
+
+if (isfilepresent("$PALM_BIN/../../.ncl.config")) then
+   loadscript("$PALM_BIN/../../.ncl.config")
 else
-  if (isfilepresent("~/palm/current_version/trunk/SCRIPTS/NCL/ncl_preferences.ncl")) then
-     loadscript( "~/palm/current_version/trunk/SCRIPTS/NCL/ncl_preferences.ncl")
+  if (isfilepresent("$PALM_BIN/NCL/.ncl.config.default")) then
+     loadscript( "$PALM_BIN/NCL/.ncl.config.default")
   else
-      print(" ")
-      print("'ncl_preferences.ncl' does not exist in $home or $home/palm/current_version/trunk/SCRIPTS/NCL/")
+      palm_bin_path = getenv("PALM_BIN")
+      print(" ")
+      print("Neither the personal configuration file '.ncl.config' exists in")
+      print("~/palm/current_version")
+      print("nor the default configuration file '.ncl.config.default' exists in")
+      print(palm_bin_path + "/NCL")
       print(" ")
       exit
    end if
-end if
+end if    
    
 begin
@@ -36 +40 @@
    if (file_1 .EQ. "File in") then
       print(" ")
-      print("Declare input file 'file_1=' in 'ncl_preferences.ncl' or prompt")
+      print("Declare input file 'file_1=' in '.ncl.config' or prompt")
       print(" ")
       exit 
@@ -1315 +1319 @@
    ; ***************************************************
  
-   if (format_out .EQ. "eps" .OR. format_out .EQ. "epsi") then
+   if ((format_out .EQ. "eps" .OR. format_out .EQ. "epsi") .AND. n .gt. no_rows*no_columns) then
       gsn_panel(wks_ps,plot_ps(1:n),(/n,1/),resP)
       print(" ")