Changeset 42

Timestamp:

Jan 28, 2011, 8:26:22 PM (14 years ago)

Author:

aslmd

Message:

LMD_MM_MARS: tests avec physique completement commune avec le GCM nouvelle physique

Location:

trunk

Files:

• 000-README-svn (modified) (2 diffs)
• mesoscale/COMMON_GCM (added)
• mesoscale/COMMON_GCM/ajouts (added)
• mesoscale/COMMON_GCM/ajouts/meso_callkeys.h (added)
• mesoscale/COMMON_GCM/ajouts/meso_dimphys.h_ref (added)
• mesoscale/COMMON_GCM/ajouts/meso_inifis.F (added)
• mesoscale/COMMON_GCM/ajouts/meso_newcondens.F (added)
• mesoscale/COMMON_GCM/ajouts/meso_param_slope.F90 (added)
• mesoscale/COMMON_GCM/ajouts/meso_physiq.F (added)
• mesoscale/COMMON_GCM/ajouts/meso_slope.h (added)
• mesoscale/COMMON_GCM/ajouts/meso_testphys1d.F (added)
• mesoscale/COMMON_GCM/assim_aeropacity.F (added)
• mesoscale/COMMON_GCM/assim_readtesassim.F90 (added)
• mesoscale/COMMON_GCM/diff_oldgcm_oldmeso_checked (added)
• mesoscale/COMMON_GCM/diff_w_phys.sh (added)
• mesoscale/COMMON_GCM/dimradmars.h (added)
• mesoscale/COMMON_GCM/dimradmars.txt (added)
• mesoscale/COMMON_GCM/gr_fi_dyn.F (added)
• mesoscale/COMMON_GCM/meso_callkeys.txt (added)
• mesoscale/COMMON_GCM/meso_dustlift.F (added)
• mesoscale/COMMON_GCM/meso_dustlift.txt (added)
• mesoscale/COMMON_GCM/newgcm (added)
• mesoscale/COMMON_GCM/nocompile.txt (added)
• mesoscale/COMMON_GCM/oldgcm (added)
• mesoscale/COMMON_GCM/oldmeso (added)
• mesoscale/COMMON_GCM/param_slope_full.F90 (added)
• mesoscale/COMMON_GCM/pour_patcher.txt (added)
• mesoscale/COMMON_GCM/readtesassim.F90 (added)
• mesoscale/LMD_LES_MARS/modif_mars/makeles_ciclad (modified) (3 diffs)
• mesoscale/LMD_MM_MARS/makemeso (modified) (1 diff)
• mesoscale/POUR_LIBF_COMMUN (deleted)

trunk/000-README-svn

@@ -1 +1 @@
 ##
 ## PETIT MEMO SVN (a completer)
-## -- AS 18/11/2010
+## -- AS 18/11/2010 28/01/2011
 ##
 
@@ -14 +14 @@
 
 -- le mot de passe est demande au premier commit [il faut avoir modifie qqch sinon ca ne marche pas]
+
+-- pour voir les changements effectues faire
+                svn log
 
 -- toujours faire 

trunk/mesoscale/LMD_LES_MARS/modif_mars/makeles_ciclad

@@ -108 +108 @@
 #./configure 
 #sed s+"-lnetcdf"+"-lnetcdf -L$whereliblmd -llmd"+g configure.wrf | sed s+'mpif90 -f90=$(SFC)'+'/usr/lib64/openmpi/1.2.8-pgf/bin/mpif90'+g | sed s+'mpicc -cc=$(SCC)'+'/usr/lib64/openmpi/1.2.8-gcc/bin/mpicc -DMPI2_SUPPORT'+g > yeah
-   #### NEW NEW NEW NEW
-   sed s+"-lnetcdf"+"-lnetcdf -L$whereliblmd -llmd"+g configure.wrf | sed s+'mpif90 -f90=$(SFC)'+'/usr/lib64/openmpi/1.4.2-pgf/bin/mpif90'+g | sed s+'mpicc -cc=$(SCC)'+'/usr/lib64/openmpi/1.4.2-gfortran/bin/mpicc -DMPI2_SUPPORT'+g > yeah
+sed s+"-lnetcdf"+"-lnetcdf -L$whereliblmd -llmd"+g configure.wrf | sed s+'mpif90 -f90=$(SFC)'+'/usr/lib64/openmpi/1.2.8-pgf/bin/mpif90'+g | sed s+'mpicc -cc=$(SCC)'+'/usr/lib64/openmpi/1.2.8-pgf/bin/mpicc -DMPI2_SUPPORT'+g > yeah
+   ##### NEW NEW NEW NEW
+   #sed s+"-lnetcdf"+"-lnetcdf -L$whereliblmd -llmd"+g configure.wrf | sed s+'mpif90 -f90=$(SFC)'+'/usr/lib64/openmpi/1.4.2-pgf/bin/mpif90'+g | sed s+'mpicc -cc=$(SCC)'+'/usr/lib64/openmpi/1.4.2-gfortran/bin/mpicc -DMPI2_SUPPORT'+g > yeah
 #sed s+"# -g"+"-fno-second-underscore # -g"+g configure.wrf | sed s+"-lnetcdf"+"-lnetcdf -L$whereliblmd -llmd"+g > yeah
 #sed s+"-lnetcdf"+"-lnetcdf -L$whereliblmd -llmd"+g configure.wrf | sed s+"#-g"+"-g"+g > yeah
@@ -122 +123 @@
         #mv yeah configure.wrf
 
-#sed s+"-fastsse"+" "+g configure.wrf > yeah
-sed s+"-fastsse"+"-mcmodel=medium -Mlarge_arrays"+g configure.wrf > yeah
+sed s+"-fastsse"+" "+g configure.wrf > yeah
+#sed s+"-fastsse"+"-mcmodel=medium -Mlarge_arrays"+g configure.wrf > yeah ##marche pas
 #
 # sometimes fastsse is problematic
@@ -130 +131 @@
 ##sed s+"-fastsse"+"-fastsse -mcmodel=medium"+g configure.wrf > yeah
 mv yeah configure.wrf
+
+
+#sed s+"-Mvect=noaltcode"+"#-Mvect=noaltcode"+g configure.wrf > yeah ; mv yeah configure.wrf
+
+
+
 #sed s+"-mp -Minfo=mp"+"-mp -Minfo=mp -mp=nonuma"+g configure.wrf > yeah
 #mv yeah configure.wrf

trunk/mesoscale/LMD_MM_MARS/makemeso

@@ -422 +422 @@
   sed s/--xsize--/${physx}/g meso_dimphys.h_ref | sed s/--ysize--/${physy}/g | sed s/--physize--/${physize}/g | sed s/--zsize--/${physz}/g | sed s/--soilsize--/${soilsize}/g > dimphys.h
   head -15 dimphys.h
+     ###
+     ### TEST new new phys
+     if [[ "${phys}" == "newphys_" ]]
+     then
+       ln -sf meso_callkeys.h callkeys.h
+     fi 
+     ###
+     ###
   cd ../..