Add/update CMIP6_AERday table

NorESMhub · Oct 29, 2019 · 216c6df · 216c6df
1 parent 0b437bc
commit 216c6df
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 10 deletions.
diff --git a/namelists/var_CMIP6_NorESM2_default.nml b/namelists/var_CMIP6_NorESM2_default.nml
@@ -529,8 +529,8 @@
 !                'wetso4       ','SO4_A1SFWET+SO4_A2SFWET+SO4_ACSFWET+SO4_NASFWET+SO4_PRSFWET+SO4_A1_OCWSFWET+SO4_A2_OCWSFWET+SO4_AC_OCWSFWET+SO4_NA_OCWSFWET+SO4_PR_OCWSFWET','    ',
 !                'toz          ','cb_ozone_c       ','                   ',
 !                'wetbc        ','BC_ACSFWET+BC_AISFWET+BC_ASFWET+BC_AXSFWET+BC_NISFWET+BC_NSFWET+BC_AC_OCWSFWET+BC_AI_OCWSFWET+BC_A_OCWSFWET+BC_NI_OCWSFWET+BC_N_OCWSFWET','',
-!                'cod          ','TAUTMODIS/CLTMODIS ','                   ',
-!                'reffclwtop   ','REFFCLWMODIS/CLWMODIS','                 ',
+!                'cod          ','TAUTMODIS/CLTMODIS ','unitless;Dfield2 ',
+!                'reffclwtop   ','REFFCLWMODIS/CLWMODIS','Dfield2        ',
 !                'chegpso4     ','GS_H2SO4         ','          ',
 !                'cltc         ','CONCLD * 100 as a 3d variable only    ','          ',      
 /
@@ -792,10 +792,17 @@ dAERday        = .true.
 tAERday        = 'CMIP6_AERday.json', 
 rAERday        = 1000000, 
 vAERday        = 
-                 'zg10        ','Z010       ','          ',
-                 'zg500       ','Z500       ','          ',
-                 'ua10        ','U010       ','          ',
-                 'va10        ','V010       ','          ',
+                 'od550aer  ','DOD550/DAYFOC','unitless;dayfoc',
+                 'ua10      ','U010         ','         ',
+                 'va10      ','V010         ','         ',
+                 'zg10      ','Z010         ','         ',
+                 'zg100     ','Z100         ','         ',
+                 'zg1000    ','Z1000        ','         ,
+                 'zg500     ','Z500         ','         ',
+! not available
+!                'ua10      ','U010         ','         ',
+!                'va10      ','V010         ','         ',
+!                'cod       ','TAUTMODIS/CLTMODIS','Dfield2',
 /
 
 &table_Eday

diff --git a/scripts/create_CMIP6_links_sha256sum.sh b/scripts/create_CMIP6_links_sha256sum.sh
@@ -158,13 +158,18 @@ for fname in $(tail -n +2 ${ROOT}/${folder}.links)
     do
         real=$(echo $fname |cut -d"/" -f1)
         sha256sum $fname >>.${real}.sha256sum_${VER} &
-        if [ $(($k%15)) -eq 0 ]; then
-            echo -ne "sha256sum: $k/$nf files\r"
-            wait
+        echo -ne "sha256sum: $k/$nf files\r"
+        np=$(ps x |grep -c 'sha256sum')
+        if [ $np -lt 17 ]; then
+            sleep 10s
         fi
+        #if [ $(($k%15)) -eq 0 ]; then
+            #echo -ne "sha256sum: $k/$nf files\r"
+            #wait
+        #fi
         let k+=1
 done
-
+echo -e "\r"
 echo "---------------------"
 echo "      ALL DONE       "
 echo "---------------------"