Changeset 2147

Timestamp:

Feb 9, 2017 4:52:29 PM (8 years ago)

Author:

scharf

Message:

improved palmplot, added two imuk hosts, changed allocation of resources for lcbullhh and corrected land surface parameters

Location:

palm/trunk

Files:

• SCRIPTS/NCL/cross_sections.ncl (modified) (3 diffs)
• SCRIPTS/mrun (modified) (3 diffs)
• SCRIPTS/subjob (modified) (3 diffs)
• SOURCE/land_surface_model_mod.f90 (modified) (1 diff)

palm/trunk/SCRIPTS/NCL/cross_sections.ncl

@@ -416 +416 @@
    cs_res@tmYLMode                ="Automatic"
   
-   cs_res@cnLevelSelectionMode    = "ManualLevels"
+   cs_res@cnLevelSelectionMode    = "AutomaticLevels"
    cs_res@lbLabelFontHeightF = font_size_legend
    cs_res@lbLabelStride = legend_label_stride
@@ -1819 +1819 @@
       if(check) then
 
-         space=(MaxVal(varn)-MinVal(varn))/24
+         space=(decimalPlaces(MaxVal(varn),3,True)-decimalPlaces(MinVal(varn),3,True))/24
   
-         cs_res@cnMinLevelValF = MinVal(varn)
-         cs_res@cnMaxLevelValF = MaxVal(varn) 
-
-         cs_res@cnLevelSpacingF = space
+         ;cs_res@cnMinLevelValF = decimalPlaces(MinVal(varn),3,True)
+         ;cs_res@cnMaxLevelValF = decimalPlaces(MaxVal(varn),3,True)
+
+         ;cs_res@cnLevelSpacingF = space
+         cs_res@cnMaxLevelCount = 26
       
          ; ****************************************************
@@ -1980 +1981 @@
                      end if
 
+                     ;if (topo .EQ. 0) then
+                        ;nothing to be done
+                     ;else
+                     ;   print("'topo' is set to " + topo)
+
+                        ;plot(n) = gsn_csm_contour(wks_ps,\
+                                            ;data(varn,lo,li-lis,:,:),cs_res)
+                        ;if(vNam(varn) .EQ. "zwwi" .OR. \
+                         ;  vNam(varn) .EQ. "zusi") then
+                          ; to_res@cnFillPalette = "GMT_gray"
+                           ;plot_topo = gsn_csm_contour(wks_ps,\
+                            ;  data(varn,lo,li-lis,:,:),to_res)
+                         ;end if
+                        ;overlay(plot(n), plot_topo) 
+                     ;end if
+
                      if (vector .EQ. 1 .AND. plotvec .EQ. "plotvec") then
                         ;nothing to be done

palm/trunk/SCRIPTS/mrun

@@ -387 +387 @@
           if [[ $tmpcreate = true ]]
           then
-             printf "\n  *** Contents of \"$TEMPDIR\":\n"
-             ls -al; cd
+#              printf "\n  *** Contents of \"$TEMPDIR\":\n"
+#              ls -al; cd
              [[ $delete_temporary_catalog = true ]]  &&  rm -rf $TEMPDIR
           fi
@@ -451 +451 @@
        (C)   restart_run=true; mc="$mc -C";;
        (d)   fname=$OPTARG; mc="$mc -d$OPTARG";;
-       (D)   cpp_opts="$cpp_opts $OPTARG"; mc="$mc -D'$OPTARG'";;
+#        (D)   cpp_opts="$cpp_opts $OPTARG"; mc="$mc -D'$OPTARG'";;
        (F)   job_on_file="-D"; mc="$mc -F";;
        (g)   group_number=$OPTARG; mc="$mc -g$OPTARG";;
@@ -3154 +3154 @@
                       export KMP_STACKSIZE=64m
 
-                      srun  --nodes=$nodes --ntasks-per-node=$tasks_per_node ./a.out  <  runfile_atmos
+                      srun  -n $ii --ntasks-per-node=$tasks_per_node ./a.out  <  runfile_atmos
 
                    elif [[ $host = lccrayf ]]

palm/trunk/SCRIPTS/subjob

@@ -226 +226 @@
    #  (node*)                 local_address=210.219.61.8    local_host=lckordi;;
      (gaia*)                 local_address=150.183.146.24; local_host=ibmkisti;;
+     (gharbi)                local_address=130.75.105.47;  local_host=lcmuk;;
      (gallego)               local_address=130.75.105.10;  local_host=lcmuk;;
      (gregale)               local_address=130.75.105.109; local_host=lcmuk;;
@@ -236 +237 @@
      (jaboticaba)            local_address=150.163.25.181; local_host=lcbr;;
      (sno)                   local_address=130.75.105.113; local_host=lcmuk;;
+     (kuma)                  local_address=130.75.105.115; local_host=lcmuk;;
      (levanto)               local_address=130.75.105.45;  local_host=lcmuk;;
      (login*)                local_address=118.128.66.201; local_host=lckiaps;;
@@ -440 +442 @@
                  esac;;
         (lcbullhh) case  $ndq  in
-                     (compute|shared)  error=false;;
+                     (compute|compute2|shared)  error=false;;
                      (*)                                     error=true;;
                  esac;;

palm/trunk/SOURCE/land_surface_model_mod.f90

@@ -470 +470 @@
                                    0.10_wp,  0.10E-2_wp,  0.10E-2_wp,       & ! 16
                                    0.25_wp,  0.25E-2_wp,  0.25E-2_wp,       & ! 17
-                                   2.00_wp,  2.00E-2_wp,  2.00E-2_wp,       & ! 18
-                                   1.10_wp,  1.10E-2_wp,  1.10E-2_wp,       & ! 19
+                                   2.00_wp,     2.00_wp,     2.00_wp,       & ! 18
+                                   1.10_wp,     1.10_wp,     1.10_wp,       & ! 19
                                  1.0E-4_wp,   1.0E-5_wp,   1.0E-5_wp        & ! 20
                                  /), (/ 3, 20 /) )