Changeset 716 in lmdz_wrf for trunk

Timestamp:

Apr 25, 2016, 7:36:22 PM (9 years ago)

Author:

lfita

Message:

Fixing smaller issues

Location:

trunk/tools

Files:

• module_ForInterpolate.F90 (modified) (3 diffs)
• nc_var.py (modified) (2 diffs)
• nc_var_tools.py (modified) (3 diffs)

trunk/tools/module_ForInterpolate.F90

@@ -197 +197 @@
 END SUBROUTINE CoarselonlatFind
 
-SUBROUTINE CoarseInterpolate(dimx, dimy, projlon, projlat, Ninpts, lonvs, latvs, percen, mindiff,     &
-  ivar, newvar, newvarin, newvarinpt, newvarindiff)
+SUBROUTINE CoarseInterpolate(projlon, projlat, lonvs, latvs, percen, mindiff, ivar, newvar, newvarin, &
+  newvarinpt, newvarindiff, dimx, dimy, Ninpts)
 ! Subroutine which finds the closest grid point within a projection throughout a first guest 
 !   approche from percentages of the whole domain
@@ -270 +270 @@
           newvarinpt(iv) = 1
           newvarindiff(iv) = mindiffLl
-          PRINT *,'Lluis iv:', newvarin(ilonlat(1),ilonlat(2)), ' localized:', newvarinpt(iv),        &
-            ' values:', newvar(ilonlat(1),ilonlat(2)), ' invalues:', ivar(iv), ' mindist:',           &
-            newvarindiff(iv), ' point:',ilonlat    
+!          PRINT *,'Lluis iv:', newvarin(ilonlat(1),ilonlat(2)), ' localized:', newvarinpt(iv),        &
+!            ' values:', newvar(ilonlat(1),ilonlat(2)), ' invalues:', ivar(iv), ' mindist:',           &
+!            newvarindiff(iv), ' point:',ilonlat    
         ELSE
           PRINT *,TRIM(ErrWarnMsg('err'))
@@ -282 +282 @@
 
 !        IF (MOD(iv,Ninpts1) == 0) newnc.sync()
-      ELSE
-        PRINT *,TRIM(ErrWarnMsg('err'))
-        PRINT *,'  ' // TRIM(fname) // ': for point #', iv,' lon,lat in incomplet map:', lonvs(iv),   &
-          ' ,', latvs(iv), ' there is not a set of lon,lat in the completed map closer than: ',       &
-          mindiff, ' !!'
-        PRINT *,'    found minimum difference:', mindiffLl
-        STOP
+!      ELSE
+! Because doing boxes and Goode is not conitnuos, we should jump this error message
+!        PRINT *,TRIM(ErrWarnMsg('err'))
+!        PRINT *,'  ' // TRIM(fname) // ': for point #', iv,' lon,lat in incomplet map:', lonvs(iv),   &
+!          ' ,', latvs(iv), ' there is not a set of lon,lat in the completed map closer than: ',       &
+!          mindiff, ' !!'
+!        PRINT *,'    found minimum difference:', mindiffLl
+!        STOP
       END IF
     END IF

trunk/tools/nc_var.py

@@ -35 +35 @@
   'maskvar',                                                                         \
   'ncreplace', 'ncstepdiff', 'netcdf_concatenation', 'netcdf_fold_concatenation',    \
-  'Partialmap_Entiremap', 'remapnn',                                                 \
+  'Partialmap_Entiremap', 'Partialmap_EntiremapFor', 'remapnn',                      \
   'seasmean', 'sellonlatbox', 'sellonlatlevbox', 'selvar', 'setvar_asciivalues',     \
   'sorttimesmat', 'spacemean', 'SpatialWeightedMean', 'statcompare_files', 'submns', \
@@ -210 +210 @@
 elif oper == 'Partialmap_Entiremap':
     ncvar.Partialmap_Entiremap(opts.values, opts.ncfile, opts.varname)
+elif oper == 'Partialmap_EntiremapFor':
+    ncvar.Partialmap_EntiremapFor(opts.values, opts.ncfile, opts.varname)
 elif oper == 'seasmean':
     ncvar.seasmean(timename, opts.ncfile, opts.varname)

trunk/tools/nc_var_tools.py

@@ -19227 +19227 @@
       varn= name of the variable
     """
+    import module_ForInterpolate as fin
     import numpy.ma as ma
     import subprocess as sub
@@ -19350 +19351 @@
         lonmap = olon[:]
         latmap = olat[:]
-        projlon = olon[:]
-        projlat = olat[:]
+        projlon = olon[:].astype('float64')
+        projlat = olat[:].astype('float64')
         omapvals = oproj.variables['ptid']
         Ntotvals = omapvals.shape[0] * omapvals.shape[1]
@@ -19494 +19495 @@
             iri = ir
             ire = ir + fracs + 1
-            print iri,',',ire
+            percendone(iri,Ninpts,0.5,'done:')
+            lonvss = lonvs[iri:ire].astype('float64')
+            latvss = latvs[iri:ire].astype('float64')
+            ovars = ovar[iri:ire].astype('float64')
+
             newvar,newvarin,newvarinpt,newvarindiff =                                \
               fin.module_forinterpolate.coarseinterpolate(projlon, projlat,          \
-              lonvs[iri:ire], latvs[iri:ire], fracd, mindiff, ivar, Nmaplon,         \
-              Nmaplat, fracs)
+              lonvss, latvss, np.float64(fracd), np.float64(mindiff), ovars)
             newnc.sync()